(url-current-object, url-package-name, url-package-version): Add defvars.

[gnu-emacs] / lwlib / lwlib-Xaw.c

diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index 214548da97e6bc5284f571dba441a475d2b8c4cf..1369ed26f72e8f67095f702ceb81ff5f75bfbe14 100644 (file)
--- a/lwlib/lwlib-Xaw.c
+++ b/lwlib/lwlib-Xaw.c
@@ -3,20 +3,20 @@
 
 This file is part of the Lucid Widget Library.
 
 
 This file is part of the Lucid Widget Library.
 

-The Lucid Widget Library is free software; you can redistribute it and/or 
+The Lucid Widget Library 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)
 any later version.
 
 The Lucid Widget Library is distributed in the hope that it will be useful,
 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)
 any later version.
 
 The Lucid Widget Library is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of 
+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
 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., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */

 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>


@@ -53,13 +53,13 @@ lw_xaw_widget_p (widget)
          XtIsSubclass (widget, dialogWidgetClass));
 }
 
          XtIsSubclass (widget, dialogWidgetClass));
 }
 

+#if 0

 static void
 xaw_update_scrollbar (instance, widget, val)
      widget_instance *instance;
      Widget widget;
      widget_value *val;
 {
 static void
 xaw_update_scrollbar (instance, widget, val)
      widget_instance *instance;
      Widget widget;
      widget_value *val;
 {

-#if 0

   if (val->scrollbar_data)
     {
       scrollbar_values *data = val->scrollbar_data;
   if (val->scrollbar_data)
     {
       scrollbar_values *data = val->scrollbar_data;


@@ -115,15 +115,20 @@ xaw_update_scrollbar (instance, widget, val)
       if (new_shown != widget_shown || new_topOfThumb != widget_topOfThumb)
        XawScrollbarSetThumb (widget, new_topOfThumb, new_shown);
     }
       if (new_shown != widget_shown || new_topOfThumb != widget_topOfThumb)
        XawScrollbarSetThumb (widget, new_topOfThumb, new_shown);
     }

-#endif

 }
 }

+#endif

 
 void
 
 void

+#ifdef PROTOTYPES
+xaw_update_one_widget (widget_instance *instance, Widget widget,
+                      widget_value *val, Boolean deep_p)
+#else

 xaw_update_one_widget (instance, widget, val, deep_p)
      widget_instance *instance;
      Widget widget;
      widget_value *val;
      Boolean deep_p;
 xaw_update_one_widget (instance, widget, val, deep_p)
      widget_instance *instance;
      Widget widget;
      widget_value *val;
      Boolean deep_p;

+#endif

 {
 #if 0
   if (XtIsSubclass (widget, scrollbarWidgetClass))
 {
 #if 0
   if (XtIsSubclass (widget, scrollbarWidgetClass))


@@ -198,9 +203,13 @@ xaw_popup_menu (widget, event)
 }
 
 void
 }
 
 void

+#ifdef PROTOTYPES
+xaw_pop_instance (widget_instance *instance, Boolean up)
+#else

 xaw_pop_instance (instance, up)
      widget_instance *instance;
      Boolean up;
 xaw_pop_instance (instance, up)
      widget_instance *instance;
      Boolean up;

+#endif

 {
   Widget widget = instance->widget;
 
 {
   Widget widget = instance->widget;
 


@@ -268,6 +277,9 @@ xaw_pop_instance (instance, up)
 
 static char overrideTrans[] =
        "<Message>WM_PROTOCOLS: lwlib_delete_dialog()";
 
 static char overrideTrans[] =
        "<Message>WM_PROTOCOLS: lwlib_delete_dialog()";

+/* Dialogs pop down on any key press */
+static char dialogOverride[] =
+       "<KeyPress>Escape:      lwlib_delete_dialog()";

 static void wm_delete_window();
 static XtActionsRec xaw_actions [] = {
   {"lwlib_delete_dialog", wm_delete_window}
 static void wm_delete_window();
 static XtActionsRec xaw_actions [] = {
   {"lwlib_delete_dialog", wm_delete_window}


@@ -324,6 +336,8 @@ make_dialog (name, parent, pop_up_p, shell_title, icon_name, text_input_slot, ra
 
   ac = 0;
   dialog = XtCreateManagedWidget (name, dialogWidgetClass, shell, av, ac);
 
   ac = 0;
   dialog = XtCreateManagedWidget (name, dialogWidgetClass, shell, av, ac);

+  override = XtParseTranslationTable (dialogOverride);
+  XtOverrideTranslations (dialog, override);

 
   bc = 0;
   button = 0;
 
   bc = 0;
   button = 0;


@@ -347,7 +361,7 @@ make_dialog (name, parent, pop_up_p, shell_title, icon_name, text_input_slot, ra
         I want the separator to take up the slack between the buttons on
         the right and the buttons on the left (that is I want the buttons
         after the separator to be packed against the right edge of the
         I want the separator to take up the slack between the buttons on
         the right and the buttons on the left (that is I want the buttons
         after the separator to be packed against the right edge of the

-        window) but I can't seem to make it do it.  
+        window) but I can't seem to make it do it.

        */
       ac = 0;
       XtSetArg (av [ac], XtNfromHoriz, button); ac++;
        */
       ac = 0;
       XtSetArg (av [ac], XtNfromHoriz, button); ac++;


@@ -395,7 +409,7 @@ xaw_create_dialog (instance)
   Widget widget;
   Boolean pop_up_p = instance->pop_up_p;
   char *shell_name = 0;
   Widget widget;
   Boolean pop_up_p = instance->pop_up_p;
   char *shell_name = 0;

-  char *icon_name;
+  char *icon_name = 0;

   Boolean text_input_slot = False;
   Boolean radio_box = False;
   Boolean list = False;
   Boolean text_input_slot = False;
   Boolean radio_box = False;
   Boolean list = False;


@@ -431,7 +445,7 @@ xaw_create_dialog (instance)
     shell_name = "Question";
     break;
   }
     shell_name = "Question";
     break;
   }

-  
+

   total_buttons = name [1] - '0';
 
   if (name [3] == 'T' || name [3] == 't')
   total_buttons = name [1] - '0';
 
   if (name [3] == 'T' || name [3] == 't')


@@ -441,9 +455,9 @@ xaw_create_dialog (instance)
     }
   else if (name [3])
     right_buttons = name [4] - '0';
     }
   else if (name [3])
     right_buttons = name [4] - '0';

-  
+

   left_buttons = total_buttons - right_buttons;
   left_buttons = total_buttons - right_buttons;

-  
+

   widget = make_dialog (name, parent, pop_up_p,
                        shell_name, icon_name, text_input_slot, radio_box,
                        list, left_buttons, right_buttons);
   widget = make_dialog (name, parent, pop_up_p,
                        shell_name, icon_name, text_input_slot, radio_box,
                        list, left_buttons, right_buttons);


@@ -502,8 +516,8 @@ xaw_generic_callback (widget, closure, call_data)
 }
 
 static void
 }
 
 static void

-wm_delete_window (shell, closure, call_data)
-     Widget shell;
+wm_delete_window (w, closure, call_data)
+     Widget w;

      XtPointer closure;
      XtPointer call_data;
 {
      XtPointer closure;
      XtPointer call_data;
 {


@@ -511,7 +525,13 @@ wm_delete_window (shell, closure, call_data)
   Cardinal nkids;
   int i;
   Widget *kids = 0;
   Cardinal nkids;
   int i;
   Widget *kids = 0;

-  Widget widget;
+  Widget widget, shell;
+
+  if (XtIsSubclass (w, dialogWidgetClass))
+    shell = XtParent (w);
+  else
+    shell = w;
+

   if (! XtIsSubclass (shell, shellWidgetClass))
     abort ();
   XtVaGetValues (shell, XtNnumChildren, &nkids, NULL);
   if (! XtIsSubclass (shell, shellWidgetClass))
     abort ();
   XtVaGetValues (shell, XtNnumChildren, &nkids, NULL);


@@ -540,13 +560,13 @@ wm_delete_window (shell, closure, call_data)
 \f
 /* Scrollbars */
 
 \f
 /* Scrollbars */
 

+#if 0

 static void
 xaw_scrollbar_scroll (widget, closure, call_data)
      Widget widget;
      XtPointer closure;
      XtPointer call_data;
 {
 static void
 xaw_scrollbar_scroll (widget, closure, call_data)
      Widget widget;
      XtPointer closure;
      XtPointer call_data;
 {

-#if 0

   widget_instance *instance = (widget_instance *) closure;
   LWLIB_ID id;
   scroll_event event_data;
   widget_instance *instance = (widget_instance *) closure;
   LWLIB_ID id;
   scroll_event event_data;


@@ -565,16 +585,16 @@ xaw_scrollbar_scroll (widget, closure, call_data)
 
   if (instance->info->pre_activate_cb)
     instance->info->pre_activate_cb (widget, id, (XtPointer) &event_data);
 
   if (instance->info->pre_activate_cb)
     instance->info->pre_activate_cb (widget, id, (XtPointer) &event_data);

-#endif

 }
 }

+#endif

 
 

+#if 0

 static void
 xaw_scrollbar_jump (widget, closure, call_data)
      Widget widget;
      XtPointer closure;
      XtPointer call_data;
 {
 static void
 xaw_scrollbar_jump (widget, closure, call_data)
      Widget widget;
      XtPointer closure;
      XtPointer call_data;
 {

-#if 0

   widget_instance *instance = (widget_instance *) closure;
   LWLIB_ID id;
   scroll_event event_data;
   widget_instance *instance = (widget_instance *) closure;
   LWLIB_ID id;
   scroll_event event_data;


@@ -596,8 +616,8 @@ xaw_scrollbar_jump (widget, closure, call_data)
 
   if (instance->info->pre_activate_cb)
     instance->info->pre_activate_cb (widget, id, (XtPointer) &event_data);
 
   if (instance->info->pre_activate_cb)
     instance->info->pre_activate_cb (widget, id, (XtPointer) &event_data);

-#endif

 }
 }

+#endif

 
 static Widget
 xaw_create_scrollbar (instance)
 
 static Widget
 xaw_create_scrollbar (instance)


@@ -610,7 +630,7 @@ xaw_create_scrollbar (instance)
   Widget scrollbar;
 
   XtVaGetValues (instance->parent, XtNwidth, &width, NULL);
   Widget scrollbar;
 
   XtVaGetValues (instance->parent, XtNwidth, &width, NULL);

-  
+

   XtSetArg (av[ac], XtNshowGrip, 0); ac++;
   XtSetArg (av[ac], XtNresizeToPreferred, 1); ac++;
   XtSetArg (av[ac], XtNallowResize, True); ac++;
   XtSetArg (av[ac], XtNshowGrip, 0); ac++;
   XtSetArg (av[ac], XtNresizeToPreferred, 1); ac++;
   XtSetArg (av[ac], XtNallowResize, True); ac++;


@@ -661,3 +681,6 @@ xaw_creation_table [] =
   {"main",                     xaw_create_main},
   {NULL, NULL}
 };
   {"main",                     xaw_create_main},
   {NULL, NULL}
 };

+
+/* arch-tag: fbbd3589-ae1c-41a0-9142-f628cfee6564
+   (do not change this comment) */