/* Functions for Sun Windows menus and selection buffer.
Copyright (C) 1987 Free Software Foundation, Inc.
+This file is probably totally obsolete. In any case, the FSF is
+unwilling to support it. We agreed to include it in our distribution
+only on the understanding that we would spend no time at all on it.
+
+If you have complaints about this file, send them to peck@sun.com.
+If no one at Sun wants to maintain this, then consider it not
+maintained at all. It would be a bad thing for the GNU project if
+this file took our effort away from higher-priority things.
+
+
This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
-Author: Jeff Peck, Sun Microsystems, Inc. <peck@sun.com>
+/* Author: Jeff Peck, Sun Microsystems, Inc. <peck@sun.com>
Original ideas by David Kastan and Eric Negaard, SRI International
Major help from: Steve Greenbaum, Reasoning Systems, Inc.
<froud@kestrel.arpa>
/*
* Emacs Lisp-Callable functions for sunwindows
*/
-#include "config.h"
+#include <config.h>
#include <stdio.h>
#include <errno.h>
#include "buffer.h"
#include "termhooks.h"
-/* conversion to/from character & screen coordinates */
+/* conversion to/from character & frame coordinates */
/* From Gosling Emacs SunWindow driver by Chris Torek */
-/* Chars to screen coords. Note that we speak in zero origin. */
+/* Chars to frame coords. Note that we speak in zero origin. */
#define CtoSX(cx) ((cx) * Sun_Font_Xsize)
#define CtoSY(cy) ((cy) * Sun_Font_Ysize)
-/* Screen coords to chars */
+/* Frame coords to chars */
#define StoCX(sx) ((sx) / Sun_Font_Xsize)
#define StoCY(sy) ((sy) / Sun_Font_Ysize)
struct cursor DefaultCursor = {15, 0, PIX_SRC ^ PIX_DST, &ArrowCursorMpr};
#else
-/* The default left-arror cursor, with XOR drawing. */
+/* The default left-arrow cursor, with XOR drawing. */
static short ArrowCursorData[16] = {
0x8000,0xC000,0xE000,0xF000,0xF800,0xFC00,0xFE00,0xF000,
0xD800,0x9800,0x0C00,0x0C00,0x0600,0x0600,0x0300,0x0300};
char *cp;
static int already_initialized = 0;
- if ((! already_initialized) || (!NULL(force))) {
+ if ((! already_initialized) || (!NILP(force))) {
cp = getenv("WINDOW_GFX");
if (cp != 0) win_fd = open(cp, 2);
if (win_fd > 0)
Timeout.tv_usec = (XINT(n) - (Timeout.tv_sec * 1000)) * 1000;
if (detect_input_pending()) return(Qnil);
- DoDsp(1);
+ redisplay_preserve_echo_area ();
/*
* Check for queued keyboard input/mouse hits again
* (A bit screen update can take some time!)
"Perform redisplay.")
()
{
- DoDsp(1);
+ redisplay_preserve_echo_area ();
return(Qt);
}
/*
* If the icon is null, we just restore the DefaultCursor
*/
- if (NULL(Icon))
+ if (NILP(Icon))
CurrentCursor = DefaultCursor;
else {
/*
return(-1);
}
/*
- * The shelltool select saves newlines as carrige returns,
+ * The shelltool select saves newlines as carriage returns,
* but emacs wants newlines.
*/
for (i = 0; i < n; i++)
String = Fcar(Pair);
CHECK_STRING(String, 0);
Value = Fcdr(Pair);
- if(XTYPE(Value) == Lisp_Symbol)
+ if (SYMBOLP (Value))
Value = XSYMBOL(Value)->value;
- if(XTYPE(Value) == Lisp_Vector) {
+ if (VECTORP (Value)) {
submenu = sun_menu_create (Value);
menu_item = menu_create_item
(MENU_RELEASE, MENU_PULLRIGHT_ITEM, XSTRING(String)->data, submenu, 0);
CHECK_NUMBER(X_Position, 0);
CHECK_NUMBER(Y_Position, 1);
- CHECK_WINDOW(window, 2);
+ CHECK_LIVE_WINDOW(window, 2);
CHECK_NUMBER(Button, 3);
CHECK_VECTOR(MEnu, 4);
CHECK_GFX (Qnil);
- xpos = CtoSX (XWINDOW(window)->left + XINT(X_Position));
+ xpos = CtoSX (WINDOW_LEFT_MARGIN (XWINDOW (window)) + XINT(X_Position));
ypos = CtoSY (XWINDOW(window)->top + XINT(Y_Position));
#ifdef Menu_Base_Kludge
{static Lisp_Object symbol[2];
#ifdef Menu_Base_Kludge
/* i'm just too lazy to re-write this into C code */
/* so we will call this elisp function from C */
- sm_kludge_string = make_pure_string ("sm::menu-kludge", 15);
+ sm_kludge_string = make_pure_string ("sm::menu-kludge", 15, 15, 0);
#endif /* Menu_Base_Kludge */
defsubr(&Ssun_window_init);