--- rpl/src/encart.c	2017/08/21 09:06:02	1.61
+++ rpl/src/encart.c	2019/10/31 15:40:02	1.73
@@ -1,7 +1,7 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.1.28
-  Copyright (C) 1989-2017 Dr. BERTRAND Joël
+  RPL/2 (R) version 4.1.32
+  Copyright (C) 1989-2019 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
 
@@ -29,13 +29,33 @@
 #	include <X11/extensions/Xinerama.h>
 #endif
 
+static logical1
+valeur_erreur(logical1 nouvelle_valeur)
+{
+	static logical1 erreur = d_faux;
+	logical1		registre;
+
+	registre = erreur;
+	erreur = nouvelle_valeur;
+	return(registre);
+}
+
+#ifdef MOTIF_SUPPORT
 static int
 _XlibErrorHandler(Display *display, XErrorEvent *event)
 {
+	valeur_erreur(d_vrai);
     uprintf("An error occured detecting the mouse position\n");
     return True;
 }
 
+static void
+_XtWarningHandler(String message)
+{
+	return;
+}
+#endif
+
 void
 encart(struct_processus *s_etat_processus, integer8 duree)
 {
@@ -66,15 +86,14 @@ encart(struct_processus *s_etat_processu
 	int					y_max;
 	int					y_min;
 
-	Pixel				couleur_arriere_plan;
-	Pixel				couleur_avant_plan;
-
 	Pixmap				pixmap_rpl;
 	Pixmap				pixmap_rpl_masque;
 
 	Position			hauteur_popup;
 	Position			largeur_popup;
 
+	Screen				*screen;
+
 	String				*argv;
 
 	struct timespec		attente;
@@ -102,6 +121,8 @@ encart(struct_processus *s_etat_processu
 
 	XtAppContext		app;
 
+	XtErrorHandler		old_message_handler;
+
 	if (strstr(XmVERSION_STRING, "LessTif") != NULL)
 	{
 		printf("Lesstif is broken, please consider an upgrade to OpenMotif.\n");
@@ -118,13 +139,30 @@ encart(struct_processus *s_etat_processu
 	if (display != NULL)
 	{
 		objet_principal = XtVaOpenApplication(&app, "rpl",
-				NULL, 0, &argc, argv, NULL, topLevelShellWidgetClass, NULL);
+				NULL, 0, &argc, argv, NULL, overrideShellWidgetClass, NULL);
 		XSynchronize(XtDisplay(objet_principal), False);
 
+		old_message_handler = XtAppSetWarningHandler(app, _XtWarningHandler);
+
 		form = XtVaCreateManagedWidget("rplSplashScreen",
 				xmFormWidgetClass, objet_principal,
 				NULL);
 
+		XtVaGetValues(objet_principal,
+				XmNmwmDecorations, &decor,
+				XmNmwmFunctions, &fonctions,
+				NULL);
+
+		decor &= ~(MWM_DECOR_ALL + MWM_DECOR_MAXIMIZE + MWM_DECOR_RESIZEH
+				+ MWM_DECOR_TITLE + MWM_DECOR_MENU + MWM_DECOR_BORDER);
+		fonctions &= ~(MWM_FUNC_ALL + MWM_FUNC_RESIZE + MWM_FUNC_CLOSE
+				+ MWM_FUNC_MINIMIZE + MWM_FUNC_MAXIMIZE);
+
+		XtVaSetValues(objet_principal,
+				XmNmwmDecorations, decor,
+				XmNmwmFunctions, fonctions,
+				NULL);
+
 		cadre = XtVaCreateManagedWidget("rplExternalFrame",
 				xmFrameWidgetClass, form,
 				XmNtopAttachment, XmATTACH_FORM,
@@ -139,14 +177,9 @@ encart(struct_processus *s_etat_processu
 				XmNmarginHeight, 5,
 				NULL);
 		
-		XtVaGetValues(form,
-				XmNforeground, &couleur_avant_plan,
-				XmNbackground, &couleur_arriere_plan,
-				NULL);
-
-		if ((erreur = XCreatePixmapFromData(XtDisplay(form),
+		if ((erreur = XpmCreatePixmapFromData(XtDisplay(form),
 				DefaultRootWindow(XtDisplay(form)), rpl_xpm,
-				&pixmap_rpl, &pixmap_rpl_masque, NULL)) != 0)
+				&pixmap_rpl, &pixmap_rpl_masque, NULL)) != XpmSuccess)
 		{
 			(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
 			return;
@@ -158,21 +191,6 @@ encart(struct_processus *s_etat_processu
 				XmNlabelPixmap, pixmap_rpl,
 				NULL);
 
-		XtVaGetValues(objet_principal,
-				XmNmwmDecorations, &decor,
-				XmNmwmFunctions, &fonctions,
-				NULL);
-
-		decor &= ~(MWM_DECOR_ALL + MWM_DECOR_MAXIMIZE + MWM_DECOR_RESIZEH
-				+ MWM_DECOR_TITLE + MWM_DECOR_MENU + MWM_DECOR_BORDER);
-		fonctions &= ~(MWM_FUNC_ALL + MWM_FUNC_RESIZE + MWM_FUNC_CLOSE
-				+ MWM_FUNC_MINIMIZE + MWM_FUNC_MAXIMIZE);
-
-		XtVaSetValues(objet_principal,
-				XmNmwmDecorations, decor,
-				XmNmwmFunctions, fonctions,
-				NULL);
-
 		if (XineramaIsActive(display) == True)
 		{
 			// Récupération de la localisation des différents écrans
@@ -180,7 +198,7 @@ encart(struct_processus *s_etat_processu
 
 			ts = XineramaQueryScreens(display, &ns);
 
-			XSetErrorHandler(_XlibErrorHandler);
+			//XSetErrorHandler(_XlibErrorHandler);
 			nb_screens = XScreenCount(display);
 
 			root_windows = sys_malloc(((unsigned) nb_screens) * sizeof(Window));
@@ -192,10 +210,16 @@ encart(struct_processus *s_etat_processu
 
 			for(i = 0; i < nb_screens; i++)
 			{
-				if ((mouse_found = XQueryPointer(display, root_windows[i],
-						&window_returned, &window_returned,
-						&root_x, &root_y, &win_x, &win_y, &mask_return))
-						== True)
+				valeur_erreur(d_faux);
+
+				do
+				{
+					mouse_found = XQueryPointer(display, root_windows[i],
+							&window_returned, &window_returned,
+							&root_x, &root_y, &win_x, &win_y, &mask_return);
+				} while(valeur_erreur(d_faux) == d_vrai);
+
+				if (mouse_found == True)
 				{
 					break;
 				}
@@ -260,8 +284,6 @@ encart(struct_processus *s_etat_processu
 			offset_y = 0;
 		}
 
-		XCloseDisplay(display);
-
 #if 0
 		XtRealizeWidget(objet_principal);
 
@@ -322,14 +344,6 @@ encart(struct_processus *s_etat_processu
 
 		XtUnrealizeWidget(objet_principal);
 
-		XmDestroyPixmap(XtScreen(form), pixmap_rpl);
-		XmDestroyPixmap(XtScreen(form), pixmap_rpl_masque);
-
-		XtDestroyWidget(pixmap);
-		XtDestroyWidget(cadre);
-		XtDestroyWidget(form);
-		XtDestroyWidget(objet_principal);
-
 		while(XtAppPending(app) == 0)
 		{
 			nanosleep(&attente, NULL);
@@ -342,7 +356,19 @@ encart(struct_processus *s_etat_processu
 			nanosleep(&attente, NULL);
 		}
 
+		screen = XtScreen(form);
+
+		XtDestroyWidget(pixmap);
+		XtDestroyWidget(cadre);
+		XtDestroyWidget(form);
+		XtDestroyWidget(objet_principal);
+
+		XmDestroyPixmap(screen, pixmap_rpl);
+		XmDestroyPixmap(screen, pixmap_rpl_masque);
+
+		XtAppSetWarningHandler(app, old_message_handler);
 		XtDestroyApplicationContext(app);
+		XCloseDisplay(display);
 	}
 #	endif