Purge SXEmacs of tooltalk -- remainding tidy up

Finger's crossed, this is the END of tooltalk.  Yay!

	* PROBLEMS: Delete the tooltalk stuff.

	* etc/tests/external-widget/Makefile (CFLAGS): Remove the
	-DTOOLTALK flag

	* etc/tests/external-widget/test-ew-motif.c (handle_tt_input):
	Remove.  It was tooltalk.

	* etc/tests/external-widget/test-ew-motif.c
	(HxInitializeToolTalk): Ditto.

	* etc/tests/external-widget/test-ew-motif.c (main): Don't call
	HxInitializeToolTalk().

	* info/external-widget.texi (Using an External Client Widget):
	Don't mention tooltalk.

	* src/events/event-stream.c (execute_internal_event): Mention in
	comments relating to tooltalk to revisit with D-Bus

	* src/ui/X11/ExternalClient.h (XtNuseToolTalk): Remove.

	* src/ui/X11/ExternalClient.h (XtCUseToolTalk): Ditto.

	* .gitignore: Remove tooltalk directory.

Signed-off-by: Steve Youngs <steve@sxemacs.org>

diff --git a/.gitignore b/.gitignore
index 196d716..51a6c56 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -116,4 +116,3 @@ finder-inf.el
 ## Exceptions
 !cl-loop-parser.y
 !etc/tests/external-widget/Makefile
 ## Exceptions
 !cl-loop-parser.y
 !etc/tests/external-widget/Makefile

-!tests/tooltalk/Makefile

diff --git a/PROBLEMS b/PROBLEMS
index d6a5775..81db39f 100644 (file)
--- a/PROBLEMS
+++ b/PROBLEMS
@@ -101,13 +101,6 @@ configure with `--with-cflags='-mcpu=ultrasparc -m64''.  Apparently
 GCC on Solaris 9 defaults to building 32-bit, so you lose if you have
 64-bit PostgreSQL.
 
 GCC on Solaris 9 defaults to building 32-bit, so you lose if you have
 64-bit PostgreSQL.
 

-** Tooltalk
-
-Tooltalk seems to be very broken, and to be honest, we don't know of
-anyone who actually uses it.  So we're defaulting it to `off'.  It may
-disappear entirely in a future release, but the jury is still out on
-that one.
-

 ** 64-bit test suite failure
 
 We have had a couple of reports of the test suite failing on 64-bit
 ** 64-bit test suite failure
 
 We have had a couple of reports of the test suite failing on 64-bit

diff --git a/etc/tests/external-widget/Makefile b/etc/tests/external-widget/Makefile
index 0692ed9..8e6c0e0 100644 (file)
--- a/etc/tests/external-widget/Makefile
+++ b/etc/tests/external-widget/Makefile
@@ -1,4 +1,4 @@
-CFLAGS += -Xc -g -DTOOLTALK
+CFLAGS += -Xc -g

 EMACSHOME = ../../..
 EMACSLIBDIR = $(EMACSHOME)/editor/src
 EMACSINCLUDEDIR = $(EMACSHOME)/editor/src
 EMACSHOME = ../../..
 EMACSLIBDIR = $(EMACSHOME)/editor/src
 EMACSINCLUDEDIR = $(EMACSHOME)/editor/src

diff --git a/etc/tests/external-widget/test-ew-motif.c b/etc/tests/external-widget/test-ew-motif.c
index 15061c7..3fa9aa8 100644 (file)
--- a/etc/tests/external-widget/test-ew-motif.c
+++ b/etc/tests/external-widget/test-ew-motif.c
@@ -7,11 +7,6 @@
 #include <Xm/PanedW.h>
 #include "ExternalClient.h"
 
 #include <Xm/PanedW.h>
 #include "ExternalClient.h"
 

-#ifdef TOOLTALK
-#include <desktop/tt_c.h>
-char *HxProcID;
-#endif
-

 XtAppContext xt_app_con;
 
 void ScaleValueChangedCB(Widget scale, XtPointer app_data,
 XtAppContext xt_app_con;
 
 void ScaleValueChangedCB(Widget scale, XtPointer app_data,


@@ -29,37 +24,6 @@ void ScaleValueChangedCB(Widget scale, XtPointer app_data,
 #endif
 }
 
 #endif
 }
 

-#ifdef TOOLTALK
-static void handle_tt_input(XtPointer client_data, int *source, XtInputId * id)
-{
-       Tt_message m = tt_message_receive();
-
-       if (m && !(tt_ptr_error(m))) {
-               tt_message_destroy(m);
-       }
-}
-
-Tt_status HxInitializeToolTalk()
-{
-       static Boolean initialized = FALSE;
-
-       if (!initialized) {
-               int fd;
-               Tt_status status;
-
-               HxProcID = tt_open();
-               fd = tt_fd();
-               if (TT_OK != (status = tt_session_join(tt_default_session())))
-                       return status;
-               (void)XtAppAddInput(xt_app_con, fd, (void *)XtInputReadMask,
-                                   handle_tt_input, NULL);
-               initialized = TRUE;
-       }
-
-       return TT_OK;
-}
-#endif
-

 main(int argc, char **argv)
 {
        Widget shell, rowcolumn, scale, pushbutton, label1, label2, text;
 main(int argc, char **argv)
 {
        Widget shell, rowcolumn, scale, pushbutton, label1, label2, text;


@@ -77,10 +41,6 @@ main(int argc, char **argv)
        shell = XtAppInitialize(&xt_app_con, "Testmotif", NULL, 0,
                                &argc, argv, NULL, NULL, 0);
 
        shell = XtAppInitialize(&xt_app_con, "Testmotif", NULL, 0,
                                &argc, argv, NULL, NULL, 0);
 

-#ifdef TOOLTALK
-       HxInitializeToolTalk();
-#endif
-

        rowcolumn = XmCreateRowColumn(shell, "rowcolumn", NULL, 0);
        XtManageChild(rowcolumn);
 
        rowcolumn = XmCreateRowColumn(shell, "rowcolumn", NULL, 0);
        XtManageChild(rowcolumn);
 


@@ -113,9 +73,6 @@ main(int argc, char **argv)
                    XtVaCreateWidget(buf, externalClientWidgetClass, paned,
                                     XmNwidth, 500, XmNheight, 200,
                                     XmNtraversalOn, TRUE,
                    XtVaCreateWidget(buf, externalClientWidgetClass, paned,
                                     XmNwidth, 500, XmNheight, 200,
                                     XmNtraversalOn, TRUE,

-#ifdef TOOLTALK
-                                    XtNuseToolTalk, TRUE,
-#endif

                                     NULL);
        }
        text2 = XmCreateText(paned, "text2", NULL, 0);
                                     NULL);
        }
        text2 = XmCreateText(paned, "text2", NULL, 0);

diff --git a/info/external-widget.texi b/info/external-widget.texi
index 6f318f1..0490ec3 100644 (file)
--- a/info/external-widget.texi
+++ b/info/external-widget.texi
@@ -45,9 +45,12 @@ Emacs is told about this particular widget.  To do that, call the
 function @code{make-frame}, specifying a value for the frame parameter
 @code{window-id}.  This value should be a string containing the decimal
 representation of the widget's X window ID number (this can be obtained
 function @code{make-frame}, specifying a value for the frame parameter
 @code{window-id}.  This value should be a string containing the decimal
 representation of the widget's X window ID number (this can be obtained

-by the Xt function @code{XtWindow()}).  In order for the client program
-to communicate this information to Emacs, a method such as sending a
-ToolTalk message needs to be used.
+by the Xt function @code{XtWindow()}).
+
+@c In order for the client program to communicate this information to
+@c Emacs, a method such as sending a ToolTalk message needs to be
+@c used.
+@c (this is from the bad old days of tooltalk)

 
 Once @code{make-frame} has been called, Emacs will create a frame
 that occupies the client widget's window.  This frame can be used just
 
 Once @code{make-frame} has been called, Emacs will create a frame
 that occupies the client widget's window.  This frame can be used just

diff --git a/src/events/event-stream.c b/src/events/event-stream.c
index 813c2ca..6c098a3 100644 (file)
--- a/src/events/event-stream.c
+++ b/src/events/event-stream.c
@@ -2961,7 +2961,10 @@ execute_internal_event(Lisp_Object event)
                             every time the file descriptor becomes
                             active, so the filter function forces this
                             by returning 0.  Emacs must not interpret
                             every time the file descriptor becomes
                             active, so the filter function forces this
                             by returning 0.  Emacs must not interpret

-                            this as a closed pipe. */
+                            this as a closed pipe. 
+
+                            We don't do ToolTalk anymore, but come
+                            back and revisit this for D-Bus */

                           connected_via_filedesc_p(XPROCESS(p))))
 #ifdef HAVE_PTYS
                         /* On some OSs with ptys, when the process on
                           connected_via_filedesc_p(XPROCESS(p))))
 #ifdef HAVE_PTYS
                         /* On some OSs with ptys, when the process on

diff --git a/src/ui/X11/ExternalClient.h b/src/ui/X11/ExternalClient.h
index 5de3623..a6a8a72 100644 (file)
--- a/src/ui/X11/ExternalClient.h
+++ b/src/ui/X11/ExternalClient.h
@@ -56,13 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #define XtCShellName "ShellName"
 #endif
 
 #define XtCShellName "ShellName"
 #endif
 

-#ifndef XtNuseToolTalk
-#define XtNuseToolTalk "useToolTalk"
-#endif
-#ifndef XtCUseToolTalk
-#define XtCUseToolTalk "UseToolTalk"
-#endif
-

 typedef struct _ExternalClientClassRec *ExternalClientWidgetClass;
 typedef struct _ExternalClientRec *ExternalClientWidget;
 extern WidgetClass externalClientWidgetClass;
 typedef struct _ExternalClientClassRec *ExternalClientWidgetClass;
 typedef struct _ExternalClientRec *ExternalClientWidget;
 extern WidgetClass externalClientWidgetClass;