* xrus.c, xrus.h, props.c: support WM_DELETE_WINDOW properly in Xaw mode.

	* Xrus.ad: set iconName for Xaw properties/error windows.

Author: lav

ChangeLog

@@ -1,3 +1,8 @@
+2001-08-16  lav
+
+	* xrus.c, xrus.h, props.c: support WM_DELETE_WINDOW properly in Xaw mode.
+	* Xrus.ad: set iconName for Xaw properties/error windows.
+
 2001-05-25  lav
 
 	* xrus.c, xrus.h: add keylog support; handle SIGUSR1 and SIGUSR2.

Xrus.ad

@@ -344,6 +344,7 @@ xrus.form.vSpace: 0
 !-------------------------------------------------------
 
 *props_xaw*title: Properties
+*props_xaw*iconName: Xrus Properties
 
 *props_xaw*locker_toggle.label: Locking
 
@@ -493,3 +494,4 @@ xrus.form.vSpace: 0
 *props_xaw*cancel_button.fromVert: default2_button
 
 *props_xaw.error_shell.title: Error
+*props_xaw.error_shell.iconName: Xrus Error

props.c

@@ -263,6 +263,7 @@ int  PropsApply()
         "Ok", ErrorDismiss_CB, (XtPointer) error_shell);
 
       XtPopup(error_shell, XtGrabExclusive);
+      XSetWMProtocols(disp,XtWindow(error_shell),&wm_delete_window,1);
 
 #endif /* TK==TK_XAW */
       return 0;
@@ -680,8 +681,12 @@ void  PropsPopup()
 }
 #endif /* TK_MOTIF */
 
-  XtPopup(props.shell, XtGrabNone);
-}
+   XtPopup(props.shell, XtGrabNone);
+
+#if TK==TK_XAW
+   XSetWMProtocols(disp,XtWindow(props.shell),&wm_delete_window,1);
+#endif
+} /* End of PropsPopup */
 #else /* TK_NONE */
 void PropsPopup() {}
 #endif

xrus.c

@@ -218,6 +218,8 @@ XrmOptionDescRec  options[]=
 };
 
 Display        *disp;
+Atom           wm_delete_window;
+Atom           wm_protocols;
 XtAppContext   app_context;
 
 #define	StartArgs()		count=0
@@ -1220,6 +1222,27 @@ void  MainLoop(void)
                         (XtTimerCallbackProc)SetTitleIndicatorOnTimeout,
                         (XtPointer)ev.xproperty.window);
          }
+         break;
+#if TK==TK_XAW
+      case(ClientMessage):
+         fflush(stdout);
+         if(ev.xclient.message_type==wm_protocols && ev.xclient.format==32
+         && ev.xclient.data.l[0]==wm_delete_window)
+         {
+            if(ev.xclient.window==XtWindow(top_level))
+            {
+               XtDestroyApplicationContext(app_context);
+               app_context=NULL;
+            }
+            else
+            {
+               Widget w=XtWindowToWidget(disp,ev.xclient.window);
+               if(w)
+                  XtPopdown(w);
+            }
+         }
+         break;
+#endif /* TK_XAW */
       }
    }
 }
@@ -1408,7 +1431,6 @@ int   main(int argc,char **argv)
    int   scr;
 
    Window w;
-   Atom  wm_delete_window;
    Atom  wm_client_leader;
 
    int   saved_argc=argc;
@@ -1637,6 +1659,7 @@ int   main(int argc,char **argv)
 
    wm_client_leader=XInternAtom(disp,"WM_CLIENT_LEADER",False);
    wm_delete_window=XInternAtom(disp,"WM_DELETE_WINDOW",False);
+   wm_protocols=XInternAtom(disp,"WM_PROTOCOLS",False);
 
    XChangeProperty(disp,w,ol_decor_del_atom,XA_ATOM,32,
          PropModeReplace,(void*)ol_decor_del,2);

xrus.h

@@ -53,6 +53,7 @@ extern   char  DefaultToRusKeys[];
 extern   char  DefaultSwitchForOneKeys[];
 
 extern   Display        *disp;
+extern   Atom           wm_delete_window;
 extern   XtAppContext   app_context;
 
 #define	 StartArgs()		count=0