openttd-ottdgrfs: comparison window.c

equal deleted inserted replaced

-:2f0cb276d32a
+:ef2a8a524a95
 {
 	if (w == NULL) return;
 	SetDirtyBlocks(w->left, w->top, w->left + w->width, w->top + w->height);
 }
+/** Find the Window whose parent pointer points to this window
+* @parent w Window to find child of
+* @return return a Window pointer that is the child of w, or NULL otherwise */
+static Window *FindChildWindow(const Window *w)
+{
+	Window* const *wz;
+	FOR_ALL_WINDOWS(wz) {
+		Window *v = *wz;
+		if (v->parent == w) return v;
+	}
+	return NULL;
+}
 /** Find the z-value of a window. A window must already be open
 * or the behaviour is undefined but function should never fail */
 Window **FindWindowZPosition(const Window *w)
 {
 	Window **wz;
-	for (wz = _z_windows;; wz++) {
+	for (wz = _z_windows; wz != _last_z_window; wz++) {
-		assert(wz < _last_z_window);
 		if (*wz == w) return wz;
 	}
+	DEBUG(misc, 3, "Window (class %d, number %d) is not open, probably removed by recursive calls",
+		w->window_class, w->window_number);
+	return NULL;
 }
 void DeleteWindow(Window *w)
 {
+	Window *v;
 	Window **wz;
 	if (w == NULL) return;
+	/* Delete any children a window might have in a head-recursive manner */
+	v = FindChildWindow(w);
+	if (v != NULL) DeleteWindow(v);
 	if (_thd.place_mode != VHM_NONE &&
 			_thd.window_class == w->window_class &&
 			_thd.window_number == w->window_number) {
 		ResetObjectToPlace();
 	SetWindowDirty(w);
 	free(w->widget);
 	w->widget = NULL;
 	w->widget_count = 0;
+	w->parent = NULL;
 	/* Find the window in the z-array, and effectively remove it
 	 * by moving all windows after it one to the left */
 	wz = FindWindowZPosition(w);
+	if (wz == NULL) return;
 	memmove(wz, wz + 1, (byte*)_last_z_window - (byte*)wz);
 	_last_z_window--;
 }
 Window *FindWindowById(WindowClass cls, WindowNumber number)
 	_no_scroll = 0;
 }
 void UnInitWindowSystem(void)
 {
-	Window* const *wz;
+	Window **wz;
-	// delete all malloced widgets
+	/* Delete all malloced widgets, and reset z-array */
 	FOR_ALL_WINDOWS(wz) {
 		free((*wz)->widget);
 		(*wz)->widget = NULL;
 		(*wz)->widget_count = 0;
-	}
+		*wz = NULL;
+	}
+	_last_z_window = _z_windows;
 }
 void ResetWindowSystem(void)
 {
 	UnInitWindowSystem();
 	_cursor.delta.x = 0;
 	_cursor.delta.y = 0;
 	return false;
 }
-static void MaybeBringWindowToFront(const Window *w)
+/** Check if a window can be made top-most window, and if so do
-{
+* it. If a window does not obscure any other windows, it will not
+* be brought to the foreground. Also if the only obscuring windows
+* are so-called system-windows, the window will not be moved.
+* The function will return false when a child window of this window is a
+* modal-popup; function returns a false and child window gets a white border
+* @param w Window to bring on-top
+* @return false if the window has an active modal child, true otherwise */
+static bool MaybeBringWindowToFront(const Window *w)
+{
+	bool bring_to_front = false;
 	Window* const *wz;
 	Window* const *uz;
 	if (w->window_class == WC_MAIN_WINDOW ||
 			IsVitalWindow(w) ||
 			w->window_class == WC_TOOLTIPS ||
 			w->window_class == WC_DROPDOWN_MENU) {
-		return;
+		return true;
 	}
 	wz = FindWindowZPosition(w);
 	for (uz = wz; ++uz != _last_z_window;) {
-		const Window *u = *uz;
+		Window *u = *uz;
+		/* A modal child will prevent the activation of the parent window */
+		if (u->parent == w && (u->desc_flags & WDF_MODAL)) {
+			u->flags4 |= WF_WHITE_BORDER_MASK;
+			SetWindowDirty(u);
+			return false;
+		}
 		if (u->window_class == WC_MAIN_WINDOW ||
 				IsVitalWindow(u) ||
 				u->window_class == WC_TOOLTIPS ||
 				u->window_class == WC_DROPDOWN_MENU) {
 			continue;
 		}
+		/* Window sizes don't interfere, leave z-order alone */
 		if (w->left + w->width <= u->left ||
 				u->left + u->width <= w->left ||
 				w->top  + w->height <= u->top ||
 				u->top + u->height <= w->top) {
 			continue;
 		}
-		BringWindowToFront(w);
+		bring_to_front = true;
-		return;
+	}
-	}
+	if (bring_to_front) BringWindowToFront(w);
+	return true;
 }
 /** Send a message from one window to another. The receiving window is found by
 * @param w @see Window pointer pointing to the other window
 * @param msg Specifies the message to be sent
 	if (click == 0 && mousewheel == 0) return;
 	w = FindWindowFromPt(x, y);
 	if (w == NULL) return;
-	MaybeBringWindowToFront(w);
+	if (!MaybeBringWindowToFront(w)) return;
 	vp = IsPtInWindowViewport(w, x, y);
 	/* Don't allow any action in a viewport if either in menu of in generating world */
 	if (vp != NULL && (_game_mode == GM_MENU || IsGeneratingWorld())) return;

branch	custombridgeheads
changeset 5623	ef2a8a524a95
parent 5568	75f13d7bfaed