oops, left out the call to touch in bsetbg's create_tempfile\nhandle …

…unknown single letter options in bsetbg\nhandle the reparentNotify event when the client is already unmapped
bbidulock · Feb 11, 2002 · 1898d25 · 1898d25
1 parent 8eb652c
commit 1898d25
Show file tree

Hide file tree

Showing 20 changed files with 1,594 additions and 1,524 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -4,6 +4,16 @@ Changes from 0.62.1:
   - bsetroot now sets _XROOTPMAP_ID, so pseudo transparent apps will be happy
   - beginnings of a strut implementation.  toolbar and slit are removed from
     the available screen area
+  - bsetbg now tries to use tempfile, then mktemp and finally defaults to
+    creating a .$$ temporary file itself if none of the commands are found.
+    Also updated the command line argument parser to handler unknown single
+    letter arguments.
+  - handle the odd edge case where a reparent event occurs while the window
+    is unmapped.  XReparentWindow sends an UnmapNotify to the window manager
+    however the window is already unmapped so the window manager never gets
+    the event and the unmapNotify event is where reparentNotify was handled.
+    Added a reparentNotifyEvent handler in the BlackboxWindow class and a new
+    case in the Blackbox class's process_event function.
 
 Changes from 0.62.0 to 0.62.1:
   - the lock modifier code handles user redefined modifiers better

diff --git a/nls/C/Window.m b/nls/C/Window.m
@@ -13,5 +13,5 @@
 # BlackboxWindow::mapRequestEvent() for 0x%lx\n
 $ #UnmapNotify
 # BlackboxWindow::unmapNotifyEvent() for 0x%lx\n
-$ #UnmapNotifyReparent
-# BlackboxWindow::unmapnotifyEvent: reparent 0x%lx to root\n
+$ #ReparentNotify
+# BlackboxWindow::reparentNotifyEvent: reparent 0x%lx to 0x%lx\n
diff --git a/nls/da_DK/Window.m b/nls/da_DK/Window.m
@@ -13,5 +13,5 @@
 # BlackboxWindow::mapRequestEvent() for 0x%lx\n
 $ #UnmapNotify
 # BlackboxWindow::unmapNotifyEvent() for 0x%lx\n
-$ #UnmapNotifyReparent
-# BlackboxWindow::unmapnotifyEvent: s�tter 0x%lx til hovedvinduet\n
+$ #ReparentNotify
+# BlackboxWindow::reparentNotifyEvent: s�tter 0x%lx til 0x%lx\n
diff --git a/nls/de_DE/Window.m b/nls/de_DE/Window.m
@@ -13,5 +13,5 @@
 # BlackboxWindow::mapRequestEvent() von 0x%lx\n
 $ #UnmapNotify
 # BlackboxWindow::unmapNotifyEvent() von  0x%lx\n
-$ #UnmapNotifyReparent
-# BlackboxWindow::unmapnotifyEvent: 0x%lx nun Child des root window\n
+$ #ReparentNotify
+# BlackboxWindow::reparentNotifyEvent: 0x%lx nun Child des 0x%lx\n
diff --git a/nls/es_ES/Window.m b/nls/es_ES/Window.m
@@ -4,15 +4,15 @@
 $ #Creating
 # BlackboxWindow::BlackboxWindow: creando 0x%lx\n
 $ #XGetWindowAttributesFail
-# BlackboxWindow::BlackboxWindow: XGetWindowAttributres falt�\n
+# BlackboxWindow::BlackboxWindow: XGetWindowAttributres fall�\n
 $ #CannotFindScreen
-# BlackboxWindow::BlackboxWindow: no pude encontrar la pantalla para la ventana \
-  fundamental 0x%lx\n
+# BlackboxWindow::BlackboxWindow: no se puede encontrar la pantalla para la ventana \
+  ra�z 0x%lx\n
 $ #Unnamed
 # Sin nombre
 $ #MapRequest
 # BlackboxWindow::mapRequestEvent() para 0x%lx\n
 $ #UnmapNotify
 # BlackboxWindow::unmapNotifyEvent() para 0x%lx\n
-$ #UnmapNotifyReparent
-# BlackboxWindow::unmapnotifyEvent: padre nuevo para 0x%lx es la ra�z\n
+$ #ReparentNotify
+# BlackboxWindow::reparentNotifyEvent: el padre nuevo para 0x%lx es 0x%lx\n
diff --git a/nls/et_EE/Window.m b/nls/et_EE/Window.m
@@ -13,5 +13,5 @@
 # BlackboxWindow::mapRequestEvent() 0x%lx'le\n
 $ #UnmapNotify
 # BlackboxWindow::unmapNotifyEvent() 0x%lx'le\n
-$ #UnmapNotifyReparent
-# BlackboxWindow::unmapnotifyEvent: 0x%lx juurele\n
+$ #ReparentNotify
+# BlackboxWindow::reparentNotifyEvent: 0x%lx juurele 0x%lx\n
diff --git a/nls/fr_FR/Window.m b/nls/fr_FR/Window.m
@@ -13,5 +13,5 @@
 # BlackboxWindow::mapRequestEvent() pour 0x%lx\n
 $ #UnmapNotify
 # BlackboxWindow::unmapNotifyEvent() pour 0x%lx\n
-$ #UnmapNotifyReparent
-# BlackboxWindow::unmapnotifyEvent: r�attribue 0x%lx � la fen�tre principale\n
+$ #ReparentNotify
+# BlackboxWindow::reparentNotifyEvent: r�attribue 0x%lx � la 0x%lx\n
diff --git a/nls/it_IT/Window.m b/nls/it_IT/Window.m
@@ -13,5 +13,5 @@
 # BlackboxWindow::mapRequestEvent() per 0x%lx\n
 $ #UnmapNotify
 # BlackboxWindow::unmapNotifyEvent() per 0x%lx\n
-$ #UnmapNotifyReparent
-# BlackboxWindow::unmapnotifyEvent: reparent 0x%lx a root\n
+$ #ReparentNotify
+# BlackboxWindow::reparentNotifyEvent: reparent 0x%lx a 0x%lx\n
diff --git a/nls/ja_JP/Window.m b/nls/ja_JP/Window.m
@@ -14,5 +14,5 @@
 # BlackboxWindow::mapRequestEvent() (0x%lx ���Ф���)\n
 $ #UnmapNotify
 # BlackboxWindow::unmapNotifyEvent() (0x%lx ���Ф���)\n
-$ #UnmapNotifyReparent
-# BlackboxWindow::unmapnotifyEvent: reparent 0x%lx to root\n
+$ #ReparentNotify
+# BlackboxWindow::unmapnotifyEvent: reparent 0x%lx to 0x%lx\n
diff --git a/nls/nl_NL/Window.m b/nls/nl_NL/Window.m
@@ -13,5 +13,5 @@
 # BlackboxWindow::mapRequestEvent() voor 0x%lx\n
 $ #UnmapNotify
 # BlackboxWindow::unmapNotifyEvent() voor 0x%lx\n
-$ #UnmapNotifyReparent
-# BlackboxWindow::unmapnotifyEvent: reparent 0x%lx naar root window\n
+$ #ReparentNotify
+# BlackboxWindow::reparentNotifyEvent: reparent 0x%lx naar 0x%lx\n
diff --git a/nls/pt_BR/Window.m b/nls/pt_BR/Window.m
@@ -13,5 +13,5 @@
 # BlackboxWindow::mapRequestEvent() para 0x%lx\n
 $ #UnmapNotify
 # BlackboxWindow::unmapNotifyEvent() para 0x%lx\n
-$ #UnmapNotifyReparent
-# BlackboxWindow::unmapnotifyEvent: reparent 0x%lx to root\n
+$ #ReparentNotify
+# BlackboxWindow::reparentNotifyEvent: reparent 0x%lx to 0x%lx\n
diff --git a/nls/ru_RU/Window.m b/nls/ru_RU/Window.m
@@ -13,5 +13,5 @@
 # BlackboxWindow::mapRequestEvent() ��� 0x%lx\n
 $ #UnmapNotify
 # BlackboxWindow::unmapNotifyEvent() ��� 0x%lx\n
-$ #UnmapNotifyReparent
-# BlackboxWindow::unmapnotifyEvent: reparent 0x%lx to root\n
+$ #ReparentNotify
+# BlackboxWindow::reparentNotifyEvent: reparent 0x%lx to 0x%lx\n
diff --git a/nls/sl_SI/Window.m b/nls/sl_SI/Window.m
@@ -13,5 +13,5 @@
 # BlackboxWindow::mapRequestEvent() za 0x%lx\n
 $ #UnmapNotify
 # BlackboxWindow::unmapNotifyEvent() za 0x%lx\n
-$ #UnmapNotifyReparent
-# BlackboxWindow::unmapnotifyEvent: ponovno priklju�eno 0x%lx korenskemu oknu\n
+$ #ReparentNotify
+# BlackboxWindow::unmapnotifyEvent: ponovno priklju�eno 0x%lx korenskemu oknu 0x%lx\n
diff --git a/nls/sv_SE/Window.m b/nls/sv_SE/Window.m
@@ -13,5 +13,5 @@
 # BlackboxWindow::mapRequestEvent() f�r 0x%lx\n
 $ #UnmapNotify
 # BlackboxWindow::unmapNotifyEvent() f�r 0x%lx\n
-$ #UnmapNotifyReparent
-# BlackboxWindow::unmapnotifyEvent: 0x%lx till root\n
+$ #ReparentNotify
+# BlackboxWindow::reparentNotifyEvent: �terf�r 0x%lx till 0x%lx\n
diff --git a/nls/tr_TR/Window.m b/nls/tr_TR/Window.m
@@ -13,5 +13,5 @@
 # 0x%lx i�in BlackboxWindow::mapRequestEvent()\n
 $ #UnmapNotify
 # 0x%lx i�in BlackboxWindow::unmapNotifyEvent()\n
-$ #UnmapNotifyReparent
-# BlackboxWindow::unmapnotifyEvent: 0x%lx'i ana pencereyi boya\n
+$ #ReparentNotify
+# BlackboxWindow::reparentNotifyEvent: 0x%lx'i ana pencereyi boya 0x%lx\n
diff --git a/nls/zh_CN/Window.m b/nls/zh_CN/Window.m
@@ -13,5 +13,5 @@
 # BlackboxWindow::mapRequestEvent() for 0x%lx\n
 $ #UnmapNotify
 # BlackboxWindow::unmapNotifyEvent() for 0x%lx\n
-$ #UnmapNotifyReparent
-# BlackboxWindow::unmapnotifyEvent: reparent 0x%lx to root\n
+$ #ReparentNotify
+# BlackboxWindow::reparentNotifyEvent: reparent 0x%lx to 0x%lx\n
diff --git a/src/Window.cc b/src/Window.cc
@@ -2251,18 +2251,10 @@ void BlackboxWindow::unmapNotifyEvent(XUnmapEvent *ue) {
     XUnmapWindow(display, frame.window);
     XUnmapWindow(display, client.window);
 
-    XEvent dummy;
-    if (! XCheckTypedWindowEvent(display, client.window, ReparentNotify,
-				 &dummy)) {
-#ifdef    DEBUG
-      fprintf(stderr, i18n->getMessage(WindowSet, WindowUnmapNotifyReparent,
-		       "BlackboxWindow::unmapNotifyEvent(): reparent 0x%lx to "
-		       "root.\n"), client.window);
-#endif // DEBUG
-
-      restoreGravity();
-      XReparentWindow(display, client.window, screen->getRootWindow(),
-		      client.x, client.y);
+    XEvent ev;
+    if (! XCheckTypedWindowEvent(display, client.window, ReparentNotify,&ev)) {
+      // calls 'delete this' so we never get past the next line
+      reparentNotifyEvent(&(ev.xreparent));
     }
 
     XFlush(display);
@@ -2283,6 +2275,22 @@ void BlackboxWindow::destroyNotifyEvent(XDestroyWindowEvent *de) {
 }
 
 
+void BlackboxWindow::reparentNotifyEvent(XReparentEvent *re) {
+  if (re->window != client.window)
+    return;
+
+#ifdef    DEBUG
+  fprintf(stderr,
+	  i18n->getMessage(WindowSet, WindowReparentNotify,
+		"BlackboxWindow::reparentNotifyEvent(): reparent 0x%lx to "
+		"0x%lx.\n"), client.window, re->parent);
+#endif // DEBUG
+
+  restoreGravity();
+  delete this;
+}
+
+
 void BlackboxWindow::propertyNotifyEvent(Atom atom) {
   blackbox->grab();
   if (! validateClient()) return;

diff --git a/src/Window.hh b/src/Window.hh
@@ -307,6 +307,7 @@ public:
   void mapRequestEvent(XMapRequestEvent *);
   void mapNotifyEvent(XMapEvent *);
   void unmapNotifyEvent(XUnmapEvent *);
+  void reparentNotifyEvent(XReparentEvent *);
   void propertyNotifyEvent(Atom);
   void exposeEvent(XExposeEvent *);
   void configureRequestEvent(XConfigureRequestEvent *);