* cmdargs.texi (Misc Variables): Remove Sun windows info.

* MACHINES: Remove Sun windows info.

* term/sun-mouse.el:
* obsolete/sun-fns.el:
* obsolete/sun-curs.el: Remove files.

* term/sun.el (select-previous-complex-command):

* sunfns.c: Remove file

* m/sun386.h:
* m/sun2.h:
* m/sparc.h: Remove Sun windows code.

5 files changed, 8 insertions, 555 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 638ca30e04..4e93e3937f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-01  Dan Nicolaescu  <[email protected]>
+
+	* sunfns.c: Remove file
+
+	* m/sun386.h:
+	* m/sun2.h:
+	* m/sparc.h: Remove Sun windows code.
+
 2007-10-31  Stefan Monnier  <[email protected]>
 
 	* keyboard.c (syms_of_keyboard): Initialize the initial_kboard.
diff --git a/src/m/sparc.h b/src/m/sparc.h
index 8df81ee91a..bf122d857c 100644
--- a/src/m/sparc.h
+++ b/src/m/sparc.h
@@ -64,18 +64,6 @@ NOTE-END  */
 
 #define SEGMENT_MASK (SEGSIZ - 1)
 
-/* Arrange to link with sun windows, if requested.  */
-/* For details on emacstool and sunfns, see etc/SUN-SUPPORT */
-/* These programs require Sun UNIX 4.2 Release 3.2 or greater */
-
-#ifdef HAVE_SUN_WINDOWS
-#define OTHER_FILES  ${etcdir}emacstool
-#define LIBS_MACHINE -lsuntool -lsunwindow -lpixrect
-#define OBJECTS_MACHINE sunfns.o
-#define SYMS_MACHINE syms_of_sunfns ()
-#define PURESIZE 130000
-#endif
-
 #if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__)
 /* This really belongs in s/sun.h.  */
 
diff --git a/src/m/sun2.h b/src/m/sun2.h
index e764ded3ce..a872bf6f3b 100644
--- a/src/m/sun2.h
+++ b/src/m/sun2.h
@@ -85,17 +85,5 @@ NOTE-END  */
 
 #define SEGMENT_MASK (SEGSIZ - 1)
 
-/* Arrange to link with sun windows, if requested.  */
-/* For details on emacstool and sunfns, see etc/SUN-SUPPORT */
-/* These programs require Sun UNIX 4.2 Release 3.2 or greater */
-
-#ifdef HAVE_SUN_WINDOWS
-#define OTHER_FILES  ${libsrc}emacstool
-#define LIBS_MACHINE -lsuntool -lsunwindow -lpixrect
-#define OBJECTS_MACHINE sunfns.o
-#define SYMS_MACHINE syms_of_sunfns ()
-#define PURESIZE 132000
-#endif
-
 /* arch-tag: 543c3570-74ca-4099-aa47-db7c7b691c8e
    (do not change this comment) */
diff --git a/src/m/sun386.h b/src/m/sun386.h
index a3eedbe755..ed98960c80 100644
--- a/src/m/sun386.h
+++ b/src/m/sun386.h
@@ -56,18 +56,6 @@ NOTE-END  */
 
 #define LIBS_TERMCAP -ltermcap
 
-/* Arrange to link with sun windows, if requested.  */
-/* For details on emacstool and sunfns, see etc/SUN-SUPPORT */
-/* These programs require Sun UNIX 4.2 Release 3.2 or greater */
-
-#ifdef HAVE_SUN_WINDOWS
-#define OTHER_FILES  ${etcdir}emacstool
-#define LIBS_MACHINE -lsuntool -lsunwindow -lpixrect
-#define OBJECTS_MACHINE sunfns.o
-#define SYMS_MACHINE syms_of_sunfns ()
-#define PURESIZE 132000
-#endif
-
 /* Roadrunner uses 'COFF' format */
 #define COFF
 
diff --git a/src/sunfns.c b/src/sunfns.c
deleted file mode 100644
index 86e64cbcdc..0000000000
--- a/src/sunfns.c
+++ /dev/null
@@ -1,519 +0,0 @@
-/* Functions for Sun Windows menus and selection buffer.
-   Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007 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 [email protected].
-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 3, or (at your option)
-any later version.
-
-GNU Emacs 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 General Public License for more details.
-
-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, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-
-/* Author: Jeff Peck, Sun Microsystems, Inc. <[email protected]>
-Original ideas by David Kastan and Eric Negaard, SRI International
-Major help from: Steve Greenbaum, Reasoning Systems, Inc.
- 		    <[email protected]>
-who first discovered the Menu_Base_Kludge.
- */
-
-/*
- *	Emacs Lisp-Callable functions for sunwindows
- */
-#include <config.h>
-
-#include <stdio.h>
-#include <errno.h>
-#include <signal.h>
-#include <sunwindow/window_hs.h>
-#include <suntool/selection.h>
-#include <suntool/menu.h>
-#include <suntool/walkmenu.h>
-#include <suntool/frame.h>
-#include <suntool/window.h>
-
-#include <fcntl.h>
-#undef NULL /* We don't need sunview's idea of NULL */
-#include "lisp.h"
-#include "window.h"
-#include "buffer.h"
-#include "termhooks.h"
-
-/* conversion to/from character & frame coordinates */
-/* From Gosling Emacs SunWindow driver by Chris Torek */
-
-/* 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)
-
-/* Frame coords to chars */
-#define StoCX(sx) ((sx) / Sun_Font_Xsize)
-#define StoCY(sy) ((sy) / Sun_Font_Ysize)
-
-#define CHECK_GFX(x) if((win_fd<0)&&(Fsun_window_init(),(win_fd<0)))return(x)
-int win_fd = -1;
-struct pixfont *Sun_Font;	/* The font */
-int Sun_Font_Xsize;		/* Width of font  */
-int Sun_Font_Ysize;		/* Height of font */
-
-#define Menu_Base_Kludge	/* until menu_show_using_fd gets fixed */
-#ifdef  Menu_Base_Kludge
-static Frame Menu_Base_Frame;
-static int Menu_Base_fd;
-static Lisp_Object sm_kludge_string;
-#endif
-struct cursor CurrentCursor;	/* The current cursor */
-
-static short CursorData[16];	/* Build cursor here */
-static mpr_static(CursorMpr, 16, 16, 1, CursorData);
-static struct cursor NewCursor = {0, 0, PIX_SRC ^ PIX_DST, &CursorMpr};
-
-#define RIGHT_ARROW_CURSOR	/* if you want the right arrow */
-#ifdef RIGHT_ARROW_CURSOR
-/* The default right-arrow cursor, with XOR drawing. */
-static short ArrowCursorData[16] = {
-  0x0001,0x0003,0x0007,0x000F,0x001F,0x003F,0x007F,0x000F,
-  0x001B,0x0019,0x0030,0x0030,0x0060,0x0060,0x00C0,0x00C0};
-static mpr_static(ArrowCursorMpr, 16, 16, 1, ArrowCursorData);
-struct cursor DefaultCursor = {15, 0, PIX_SRC ^ PIX_DST, &ArrowCursorMpr};
-
-#else
-/* 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};
-static mpr_static(ArrowCursorMpr, 16, 16, 1, ArrowCursorData);
-struct cursor DefaultCursor = {0, 0, PIX_SRC ^ PIX_DST, &ArrowCursorMpr};
-#endif
-
-/*
- *	Initialize window
- */
-DEFUN ("sun-window-init", Fsun_window_init, Ssun_window_init, 0, 1, 0,
-       doc: /* One time setup for using Sun Windows with mouse.
-Unless optional argument FORCE is non-nil, is a noop after its first call.
-Returns a number representing the file descriptor of the open Sun Window,
-or -1 if can not open it.  */)
-     (force)
-     Lisp_Object force;
-{
-  char *cp;
-  static int already_initialized = 0;
-
-  if ((! already_initialized) || (!NILP(force))) {
-    cp = getenv("WINDOW_GFX");
-    if (cp != 0) win_fd = emacs_open (cp, O_RDWR, 0);
-    if (win_fd > 0)
-      {
-	Sun_Font = pf_default();
-	Sun_Font_Xsize = Sun_Font->pf_defaultsize.x;
-	Sun_Font_Ysize = Sun_Font->pf_defaultsize.y;
-	Fsun_change_cursor_icon (Qnil);	/* set up the default cursor */
-	already_initialized = 1;
-#ifdef  Menu_Base_Kludge
-
-	/* Make a frame to use for putting the menu on, and get its fd. */
-	Menu_Base_Frame = window_create(0, FRAME,
-					WIN_X, 0, WIN_Y, 0,
-					WIN_ROWS, 1, WIN_COLUMNS, 1,
-					WIN_SHOW, FALSE,
-					FRAME_NO_CONFIRM, 1,
-					0);
-	Menu_Base_fd = (int) window_get(Menu_Base_Frame, WIN_FD);
-#endif
-      }
-  }
-  return(make_number(win_fd));
-}
-
-/*
- *	Mouse sit-for (allows a shorter interval than the regular sit-for
- *	and can be interrupted by the mouse)
- */
-DEFUN ("sit-for-millisecs", Fsit_for_millisecs, Ssit_for_millisecs, 1, 1, 0,
-       doc: /* Like sit-for, but ARG is milliseconds.
-Perform redisplay, then wait for ARG milliseconds or until
-input is available.  Returns t if wait completed with no input.
-Redisplay does not happen if input is available before it starts.  */)
-     (n)
-     Lisp_Object n;
-{
-  struct timeval Timeout;
-  int waitmask = 1;
-
-  CHECK_NUMBER (n);
-  Timeout.tv_sec = XINT(n) / 1000;
-  Timeout.tv_usec = (XINT(n) - (Timeout.tv_sec * 1000)) * 1000;
-
-  if (detect_input_pending()) return(Qnil);
-  redisplay_preserve_echo_area (16);
-  /*
-   *	Check for queued keyboard input/mouse hits again
-   *	(A bit screen update can take some time!)
-   */
-  if (detect_input_pending()) return(Qnil);
-  select(1,&waitmask,0,0,&Timeout);
-  if (detect_input_pending()) return(Qnil);
-  return(Qt);
-}
-
-/*
- *   Sun sleep-for (allows a shorter interval than the regular sleep-for)
- */
-DEFUN ("sleep-for-millisecs",
-       Fsleep_for_millisecs,
-       Ssleep_for_millisecs, 1, 1, 0,
-       doc: /* Pause, without updating display, for ARG milliseconds.  */)
-     (n)
-     Lisp_Object n;
-{
-  unsigned useconds;
-
-  CHECK_NUMBER (n);
-  useconds = XINT(n) * 1000;
-  usleep(useconds);
-  return(Qt);
-}
-
-DEFUN ("update-display", Fupdate_display, Supdate_display, 0, 0, 0,
-       doc: /* Perform redisplay.  */)
-     ()
-{
-  redisplay_preserve_echo_area (17);
-  return(Qt);
-}
-
-
-/*
- *	Change the Sun mouse icon
- */
-DEFUN ("sun-change-cursor-icon",
-       Fsun_change_cursor_icon,
-       Ssun_change_cursor_icon, 1, 1, 0,
-       doc: /* Change the Sun mouse cursor icon.
-ICON is a lisp vector whose 1st element
-is the X offset of the cursor hot-point, whose 2nd element is the Y offset
-of the cursor hot-point and whose 3rd element is the cursor pixel data
-expressed as a string.  If ICON is nil then the original arrow cursor is used.  */)
-     (Icon)
-     Lisp_Object Icon;
-{
-  register unsigned char *cp;
-  register short *p;
-  register int i;
-  Lisp_Object X_Hot, Y_Hot, Data;
-
-  CHECK_GFX (Qnil);
-  /*
-   *	If the icon is null, we just restore the DefaultCursor
-   */
-  if (NILP(Icon))
-    CurrentCursor = DefaultCursor;
-  else {
-    /*
-     *	extract the data from the vector
-     */
-    CHECK_VECTOR (Icon);
-    if (XVECTOR(Icon)->size < 3) return(Qnil);
-    X_Hot = XVECTOR(Icon)->contents[0];
-    Y_Hot = XVECTOR(Icon)->contents[1];
-    Data = XVECTOR(Icon)->contents[2];
-
-    CHECK_NUMBER (X_Hot);
-    CHECK_NUMBER (Y_Hot);
-    CHECK_STRING (Data);
-    if (SCHARS (Data) != 32) return(Qnil);
-    /*
-     *	Setup the new cursor
-     */
-    NewCursor.cur_xhot = X_Hot;
-    NewCursor.cur_yhot = Y_Hot;
-    cp = SDATA (Data);
-    p = CursorData;
-    i = 16;
-    while(--i >= 0)
-      *p++ = (cp[0] << 8) | cp[1], cp += 2;
-    CurrentCursor = NewCursor;
-  }
-  win_setcursor(win_fd, &CurrentCursor);
-  return(Qt);
-}
-
-/*
- *	Interface for sunwindows selection
- */
-static Lisp_Object Current_Selection;
-
-static
-sel_write (sel, file)
-     struct selection *sel;
-     FILE *file;
-{
-  fwrite (SDATA (Current_Selection), sizeof (char),
-	  sel->sel_items, file);
-}
-
-static
-sel_clear (sel, windowfd)
-     struct selection *sel;
-     int windowfd;
-{
-}
-
-static
-sel_read (sel, file)
-     struct selection *sel;
-     FILE *file;
-{
-  register int i, n;
-  register char *cp;
-
-  Current_Selection = empty_unibyte_string;
-  if (sel->sel_items <= 0)
-    return (0);
-  cp = (char *) malloc(sel->sel_items);
-  if (cp == (char *)0) {
-    error("malloc failed in sel_read");
-    return(-1);
-  }
-  n = fread(cp, sizeof(char), sel->sel_items, file);
-  if (n > sel->sel_items) {
-    error("fread botch in sel_read");
-    return(-1);
-  } else if (n < 0) {
-    error("Error reading selection");
-    return(-1);
-  }
-  /*
-   * The shelltool select saves newlines as carriage returns,
-   * but emacs wants newlines.
-   */
-  for (i = 0; i < n; i++)
-    if (cp[i] == '\r') cp[i] = '\n';
-
-  Current_Selection = make_string (cp, n);
-  free (cp);
-  return (0);
-}
-
-/*
- *	Set the window system "selection" to be the arg STRING
- */
-DEFUN ("sun-set-selection", Fsun_set_selection, Ssun_set_selection, 1, 1,
-       "sSet selection to: ",
-       doc: /* Set the current sunwindow selection to STRING.  */)
-     (str)
-     Lisp_Object str;
-{
-  struct selection selection;
-
-  CHECK_STRING (str);
-  Current_Selection = str;
-
-  CHECK_GFX (Qnil);
-  selection.sel_type = SELTYPE_CHAR;
-  selection.sel_items = SCHARS (str);
-  selection.sel_itembytes = 1;
-  selection.sel_pubflags = 1;
-  selection_set(&selection, sel_write, sel_clear, win_fd);
-  return (Qt);
-}
-/*
- *	Stuff the current window system selection into the current buffer
- */
-DEFUN ("sun-get-selection", Fsun_get_selection, Ssun_get_selection, 0, 0, 0,
-       doc: /* Return the current sunwindows selection as a string.  */)
-     ()
-{
-  CHECK_GFX (Current_Selection);
-  selection_get (sel_read, win_fd);
-  return (Current_Selection);
-}
-
-Menu sun_menu_create();
-
-Menu_item
-sun_item_create (Pair)
-     Lisp_Object Pair;
-{
-  /* In here, we depend on Lisp supplying zero terminated strings in the data*/
-  /* so we can just pass the pointers, and not recopy anything */
-
-  Menu_item menu_item;
-  Menu submenu;
-  Lisp_Object String;
-  Lisp_Object Value;
-
-  CHECK_LIST_CONS (Pair, Pair);
-  String = Fcar(Pair);
-  CHECK_STRING(String);
-  Value = Fcdr(Pair);
-  if (SYMBOLP (Value))
-    Value = SYMBOL_VALUE (Value);
-  if (VECTORP (Value)) {
-    submenu = sun_menu_create (Value);
-    menu_item = menu_create_item
-      (MENU_RELEASE, MENU_PULLRIGHT_ITEM, SDATA (String), submenu, 0);
-  } else {
-    menu_item = menu_create_item
-      (MENU_RELEASE, MENU_STRING_ITEM, SDATA (String), Value, 0);
-  }
-  return menu_item;
-}
-
-Menu
-sun_menu_create (Vector)
-     Lisp_Object Vector;
-{
-  Menu menu;
-  int i;
-  CHECK_VECTOR(Vector);
-  menu=menu_create(0);
-  for(i = 0; i < XVECTOR(Vector)->size; i++) {
-    menu_set (menu, MENU_APPEND_ITEM,
-	      sun_item_create(XVECTOR(Vector)->contents[i]), 0);
-  }
-  return menu;
-}
-
-/*
- *  If the first item of the menu has nil as its value, then make the
- *  item look like a label by inverting it and making it unselectable.
- *  Returns 1 if the label was made, 0 otherwise.
- */
-int
-make_menu_label (menu)
-     Menu menu;
-{
-  int made_label_p = 0;
-
-  if (( menu_get(menu, MENU_NITEMS) > 0 ) && /* At least one item */
-      ((Lisp_Object) menu_get(menu_get(menu, MENU_NTH_ITEM, 1),
-			      MENU_VALUE) == Qnil )) {
-      menu_set(menu_get(menu, MENU_NTH_ITEM, 1),
-	       MENU_INVERT, TRUE,
-	       MENU_FEEDBACK, FALSE,
-	       0);
-      made_label_p = 1;
-    }
-  return made_label_p;
-}
-
-/*
- *	Do a pop-up menu and return the selected value
- */
-DEFUN ("sun-menu-internal",
-       Fsun_menu_internal,
-       Ssun_menu_internal, 5, 5, 0,
-       doc: /* Set up a SunView pop-up menu and return the user's choice.
-Arguments WINDOW, X, Y, BUTTON, and MENU.
-*** User code should generally use sun-menu-evaluate ***
-
-Arguments WINDOW, X, Y, BUTTON, and MENU.
-Put MENU up in WINDOW at position X, Y.
-The BUTTON argument specifies the button to be released that selects an item:
-   1 = LEFT BUTTON
-   2 = MIDDLE BUTTON
-   4 = RIGHT BUTTON
-The MENU argument is a vector containing (STRING . VALUE) pairs.
-The VALUE of the selected item is returned.
-If the VALUE of the first pair is nil, then the first STRING will be used
-as a menu label.  */)
-     (window, X_Position, Y_Position, Button, MEnu)
-     Lisp_Object window, X_Position, Y_Position, Button, MEnu;
-{
-  Menu menu;
-  int button, xpos, ypos;
-  Event event0;
-  Event *event = &event0;
-  Lisp_Object Value, Pair;
-
-  CHECK_NUMBER(X_Position);
-  CHECK_NUMBER(Y_Position);
-  CHECK_LIVE_WINDOW(window);
-  CHECK_NUMBER(Button);
-  CHECK_VECTOR(MEnu);
-
-  CHECK_GFX (Qnil);
-
-  xpos = CtoSX (WINDOW_LEFT_EDGE_COL (XWINDOW (window))
-		+ WINDOW_LEFT_SCROLL_BAR_COLS (XWINDOW (window))
-		+ XINT(X_Position));
-  ypos = CtoSY (WINDOW_TOP_EDGE_LINE (XWINDOW(window)) + XINT(Y_Position));
-#ifdef  Menu_Base_Kludge
-  {static Lisp_Object symbol[2];
-   symbol[0] = Fintern (sm_kludge_string, Qnil);
-   Pair = Ffuncall (1, symbol);
-   xpos += XINT (XCDR (Pair));
-   ypos += XINT (XCAR (Pair));
- }
-#endif
-
-  button = XINT(Button);
-  if(button == 4) button = 3;
-  event_set_id   (event, BUT(button));
-  event_set_down (event);
-  event_set_x    (event, xpos);
-  event_set_y    (event, ypos);
-
-  menu = sun_menu_create(MEnu);
-  make_menu_label(menu);
-
-#ifdef  Menu_Base_Kludge
-  Value = (Lisp_Object) menu_show(menu, Menu_Base_Frame, event, 0);
-#else
-/* This confuses the notifier or something: */
-  Value = (Lisp_Object) menu_show_using_fd(menu, win_fd, event, 0);
-/*
- * Right button gets lost, and event sequencing or delivery gets mixed up
- * So, until that gets fixed, we use this <Menu_Base_Frame> kludge:
- */
-#endif
-  menu_destroy (menu);
-
-  return ((int)Value ? Value : Qnil);
-}
-
-
-/*
- *	Define everything
- */
-syms_of_sunfns()
-{
-#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, 15, 0);
-#endif /* Menu_Base_Kludge */
-
-  defsubr(&Ssun_window_init);
-  defsubr(&Ssit_for_millisecs);
-  defsubr(&Ssleep_for_millisecs);
-  defsubr(&Supdate_display);
-  defsubr(&Ssun_change_cursor_icon);
-  defsubr(&Ssun_set_selection);
-  defsubr(&Ssun_get_selection);
-  defsubr(&Ssun_menu_internal);
-}
-
-/* arch-tag: 2d7decb7-58f6-41aa-b45b-077ccfab7158
-   (do not change this comment) */