openttd-ottdgrfs: comparison src/window.cpp

equal deleted inserted replaced

-:e9066a148720
+:b3c58f3df92b
 			return;
 		}
 	}
+	/* Setup blitter, and dispatch a repaint event to window *wz */
 	DrawPixelInfo *dp = _cur_dpi;
 	dp->width = right - left;
 	dp->height = bottom - top;
 	dp->left = left - (*wz)->left;
 	dp->top = top - (*wz)->top;
 		const Window *w = *wz;
 		if (right > w->left &&
 				bottom > w->top &&
 				left < w->left + w->width &&
 				top < w->top + w->height) {
+			/* Window w intersects with the rectangle => needs repaint */
 			DrawOverlappedWindow(wz, left, top, right, bottom);
 		}
 	}
 }
 		w->window_class, w->window_number);
 	return NULL;
 }
 /**
-* Remove window and all its child windows from the window stack
+* Remove window and all its child windows from the window stack.
+* @param w Window to delete
 */
 void DeleteWindow(Window *w)
 {
 	if (w == NULL) return;
 */
 static Window *ForceFindDeletableWindow()
 {
 	Window* const *wz;
-	for (wz = _z_windows;; wz++) {
+	FOR_ALL_WINDOWS(wz) {
 		Window *w = *wz;
-		assert(wz < _last_z_window);
 		if (w->window_class != WC_MAIN_WINDOW && !IsVitalWindow(w)) return w;
 	}
+	NOT_REACHED();
 }
 bool IsWindowOfPrototype(const Window *w, const Widget *widget)
 {
 	return (w->original_widget == widget);
 * @param x position x to query
 * @param y position y to query
 * @return a pointer to the found window if any, NULL otherwise */
 Window *FindWindowFromPt(int x, int y)
 {
-	Window* const *wz;
+	for (Window * const *wz = _last_z_window; wz != _z_windows;) {
-	for (wz = _last_z_window; wz != _z_windows;) {
 		Window *w = *--wz;
 		if (IsInsideBS(x, w->left, w->width) && IsInsideBS(y, w->top, w->height)) {
 			return w;
 		}
 	}
 void InitWindowSystem()
 {
 	IConsoleClose();
 	_last_z_window = _z_windows;
+	_mouseover_last_w = NULL;
 	_no_scroll = 0;
 }
 /**
 * Close down the windowing system
 * @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 *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 true;
 	}
 	wz = FindWindowZPosition(w);
-	for (uz = wz; ++uz != _last_z_window;) {
+	for (Window * const *uz = wz; ++uz != _last_z_window;) {
 		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;
 		Window *w = *--wz;
 		w->wndproc(w, &e);
 		if (!e.we.ctrl.cont) break;
 	}
 }
-extern void UpdateTileSelection();
-extern bool VpHandlePlaceSizingDrag();
 /**
 * Local counter that is incremented each time an mouse input event is detected.
 * The counter is used to stop auto-scrolling.
 * @see HandleAutoscroll()
 	MAX_OFFSET_DOUBLE_CLICK = 5,     ///< How much the mouse is allowed to move to call it a double click
 	TIME_BETWEEN_DOUBLE_CLICK = 500, ///< Time between 2 left clicks before it becoming a double click, in ms
 };
+extern void UpdateTileSelection();
+extern bool VpHandlePlaceSizingDrag();
 void MouseLoop(MouseClick click, int mousewheel)
 {
 	int x,y;
 	Window *w;
 	ViewPort *vp;
 	}
 	return -1;
 }
 /**
-* Mark window data as invalid (in need of re-computing)
+* Mark window as dirty (in need of repainting)
-* @param w Window with invalid data
+* @param cls Window class
+* @param number Window number in that class
 */
 void InvalidateWindow(WindowClass cls, WindowNumber number)
 {
 	Window* const *wz;
 		const Window *w = *wz;
 		if (w->window_class == cls && w->window_number == number) SetWindowDirty(w);
 	}
 }
-/*
+/**
 * Mark a particular widget in a particular window as dirty (in need of repainting)
 * @param cls Window class
 * @param number Window number in that class
 * @param widget_index Index number of the widget that needs repainting
 */
 			w->InvalidateWidget(widget_index);
 		}
 	}
 }
-/*
+/**
 * Mark all windows of a particular class as dirty (in need of repainting)
 * @param cls Window class
 */
 void InvalidateWindowClasses(WindowClass cls)
 {
 	CallWindowEventNP(w, WE_INVALIDATE_DATA);
 	SetWindowDirty(w);
 }
 /**
-* Mark window data the window of a given class and specific window number as invalid (in need of re-computing)
+* Mark window data of the window of a given class and specific window number as invalid (in need of re-computing)
 * @param cls Window class
 * @param number Window number within the class
 */
 void InvalidateWindowData(WindowClass cls, WindowNumber number)
 {
 /**
 * Dispatch WE_TICK event over all windows
 */
 void CallWindowTickEvent()
 {
-	Window* const *wz;
+	for (Window * const *wz = _last_z_window; wz != _z_windows;) {
-	for (wz = _last_z_window; wz != _z_windows;) {
 		CallWindowEventNP(*--wz, WE_TICK);
 	}
 }
+/**
+* Try to delete a non-vital window.
+* Non-vital windows are windows other than the game selection, main toolbar,
+* status bar, toolbar menu, and tooltip windows. Stickied windows are also
+* considered vital.
+*/
 void DeleteNonVitalWindows()
 {
 	Window* const *wz;
 restart_search:

branch	NewGRF_ports
changeset 10274	b3c58f3df92b
parent 10242	52b4a9006029
child 10724	68a692eacf22