CVideo: removed update_rect functions

These have been functionally useless, since none of their code was ever executed. Since this hasn't caused
any problems this far, I'm removing them.

src/display.cpp

@@ -1325,7 +1325,6 @@ void display::flip()
 		const Uint32 color =  SDL_MapRGBA(video().getSurface()->format,0,0,0,SDL_ALPHA_OPAQUE);
 		// Adjust the alpha if you want to balance cpu-cost / smooth sunset
 		sdl::fill_rect_alpha(r, color, 1, frameBuffer);
-		update_rect(r);
 	}
 	font::draw_floating_labels(frameBuffer);
 	events::raise_volatile_draw_event();
@@ -1403,7 +1402,6 @@ static void draw_panel(CVideo &video, const theme::panel& panel, std::vector<std
 			surf.assign(tile_surface(surf,loc.w,loc.h));
 		}
 		video.blit_surface(loc.x, loc.y, surf);
-		update_rect(loc);
 	}
 }
 
@@ -1447,7 +1445,6 @@ static void draw_label(CVideo& video, surface target, const theme::label& label)
 		font::draw_text(&video,loc,label.font_size(),font::NORMAL_COLOR,text,loc.x,loc.y);
 	}
 
-	update_rect(loc);
 }
 
 void display::draw_all_panels()
@@ -1642,8 +1639,6 @@ void display::draw_init()
 		const surface& screen = get_screen_surface();
 		clip_rect_setter set_clip_rect(screen, &clip_rect);
 		draw_background(screen, clip_rect, theme_.border().background_image);
-		update_rect(clip_rect);
-
 		redraw_background_ = false;
 
 		// Force a full map redraw
@@ -1986,7 +1981,6 @@ bool display::scroll(int xmove, int ymove, bool force)
 		invalidate_locations_in_rect(r);
 	}
 	scroll_event_.notify_observers();
-	update_rect(map_area());
 
 	redrawMinimap_ = true;
 	return true;
@@ -2527,8 +2521,6 @@ void display::draw_invalidated() {
 		int xpos = get_location_x(loc);
 		int ypos = get_location_y(loc);
 
-		update_rect(xpos, ypos, zoom_, zoom_);
-
 		const bool on_map = get_map().on_board(loc);
 		SDL_Rect hex_rect = sdl::create_rect(xpos, ypos, zoom_, zoom_);
 		if(!sdl::rects_overlap(hex_rect,clip_rect)) {
@@ -2819,7 +2811,6 @@ void display::refresh_report(const std::string& report_name, const config * new_
 
 	if (surf) {
 		sdl_blit(surf, nullptr, screen_.getSurface(), &rect);
-		update_rect(rect);
 	}
 
 	// If the rectangle has just changed, assign the surface to it
@@ -2838,7 +2829,6 @@ void display::refresh_report(const std::string& report_name, const config * new_
 				ERR_DP << "Could not backup background for report!" << std::endl;
 			}
 		}
-		update_rect(rect);
 	}
 
 	tooltips::clear_tooltips(rect);
@@ -3003,7 +2993,6 @@ void display::invalidate_all()
 #pragma omp critical(invalidated_)
 #endif //_OPENMP
 	invalidated_.clear();
-	update_rect(map_area());
 }
 
 bool display::invalidate(const map_location& loc)

src/editor/palette/editor_palettes.cpp

@@ -403,7 +403,6 @@ void editor_palette<Item>::draw_contents()
 			y += item_space_;
 		counter++;
 	}
-	update_rect(location());
 }
 template void editor_palette<t_translation::terrain_code>::draw_contents();
 template void editor_palette<unit_type>::draw_contents();

src/editor/palette/location_palette.cpp

@@ -358,7 +358,6 @@ void location_palette::draw_contents()
 		// Adjust location
 		y += item_space_;
 	}
-	update_rect(location());
 }
 
 std::vector<std::string> location_palette::action_pressed() const

src/editor/palette/tristate_button.cpp

@@ -268,8 +268,6 @@ void tristate_button::draw_contents() {
 	clipArea.h -= 2 * offset;
 	font::draw_text(&video(), clipArea, font_size, button_color, label_, textx,
 			texty);
-
-	update_rect(loc);
 }
 
 //TODO move to widget

src/floating_label.cpp

@@ -181,8 +181,6 @@ void floating_label::draw(surface screen)
 	const clip_rect_setter clip_setter(screen, &clip_rect_);
 	sdl_copy_portion(screen,&rect,buf_,nullptr);
 	sdl_blit(surf_,nullptr,screen,&rect);
-
-	update_rect(rect);
 }
 
 void floating_label::undraw(surface screen)
@@ -194,8 +192,6 @@ void floating_label::undraw(surface screen)
 	const clip_rect_setter clip_setter(screen, &clip_rect_);
 	sdl_blit(buf_,nullptr,screen,&rect);
 
-	update_rect(rect);
-
 	move(xmove_,ymove_);
 	if(lifetime_ > 0) {
 		--lifetime_;

src/gui/widgets/window.cpp

@@ -674,7 +674,6 @@ int window::show(const bool restore, const unsigned auto_close_timeout)
 		if(restore_) {
 			SDL_Rect rect = get_rectangle();
 			sdl_blit(restorer_, 0, video_.getSurface(), &rect);
-			update_rect(get_rectangle());
 			font::undraw_floating_labels(video_.getSurface());
 		}
 		throw;
@@ -686,7 +685,6 @@ int window::show(const bool restore, const unsigned auto_close_timeout)
 	if(restore_) {
 		SDL_Rect rect = get_rectangle();
 		sdl_blit(restorer_, 0, video_.getSurface(), &rect);
-		update_rect(get_rectangle());
 		font::undraw_floating_labels(video_.getSurface());
 	}
 
@@ -711,9 +709,6 @@ void window::draw()
 		if(restore_ && restorer_) {
 			SDL_Rect rect = get_rectangle();
 			sdl_blit(restorer_, 0, frame_buffer, &rect);
-			// Since the old area might be bigger as the new one, invalidate
-			// it.
-			update_rect(rect);
 		}
 
 		layout();
@@ -746,7 +741,6 @@ void window::draw()
 			/* Force to update and redraw the entire screen */
 			dirty_list_.clear();
 			dirty_list_.push_back(std::vector<widget*>(1, this));
-			update_rect(screen_area());
 		}
 	}
 
@@ -761,7 +755,6 @@ void window::draw()
 					= SDL_MapRGBA(frame_buffer->format, 0, 0, 0, SDL_ALPHA_OPAQUE);
 
 				sdl::fill_rect_alpha(r, color, 1, frame_buffer);
-				update_rect(r);
 			}
 		}
 		return;
@@ -781,7 +774,6 @@ void window::draw()
 #if 0
 		dirty_list_.clear();
 		dirty_list_.push_back(std::vector<widget*>(1, this));
-		update_rect(screen_area());
 #else
 		clip_rect_setter clip(frame_buffer, &dirty_rect);
 #endif
@@ -854,18 +846,13 @@ void window::draw()
 			(**ritor).draw_foreground(frame_buffer, 0, 0);
 			(**ritor).set_is_dirty(false);
 		}
-
-		update_rect(dirty_rect);
 	}
 
 	dirty_list_.clear();
 
 	std::vector<widget*> call_stack;
 	populate_dirty_list(*this, call_stack);
 	assert(dirty_list_.empty());
-
-	SDL_Rect rect = get_rectangle();
-	update_rect(rect);
 }
 
 void window::undraw()
@@ -875,7 +862,6 @@ void window::undraw()
 		sdl_blit(restorer_, 0, video_.getSurface(), &rect);
 		// Since the old area might be bigger as the new one, invalidate
 		// it.
-		update_rect(rect);
 	}
 }
 

src/halo.cpp

@@ -251,8 +251,6 @@ bool halo_impl::effect::render()
 
 	sdl_blit(surf_,nullptr,screen,&rect);
 
-	update_rect(rect_);
-
 	return true;
 }
 
@@ -286,7 +284,6 @@ void halo_impl::effect::unrender()
 
 	SDL_Rect rect = sdl::create_rect(xpos, ypos, surf_->w, surf_->h);
 	sdl_blit(buffer_,nullptr,screen,&rect);
-	update_rect(rect);
 }
 
 bool halo_impl::effect::on_location(const std::set<map_location>& locations) const

src/help/help_text_area.cpp

@@ -22,7 +22,7 @@
 #include "sdl/rect.hpp"                 // for draw_rectangle, etc
 #include "serialization/parser.hpp"     // for read, write
 #include "util.hpp"                     // for lexical_cast, etc
-#include "video.hpp"                    // for update_rect, CVideo
+#include "video.hpp"                    // for CVideo
 
 #include <algorithm>                    // for max, min, find_if
 #include <ostream>                      // for operator<<, stringstream, etc
@@ -539,7 +539,6 @@ void help_text_area::draw_contents()
 			sdl_blit(it->surf, nullptr, screen, &dst);
 		}
 	}
-	update_rect(loc);
 }
 
 void help_text_area::scroll(unsigned int)

src/intro.cpp

@@ -56,7 +56,6 @@ void the_end(CVideo &video, std::string text, unsigned int duration)
 
 		const color_t col = color_t(uint8_t(n), uint8_t(n), uint8_t(n), uint8_t(n));
 		font::draw_text(&video,area,font_size,col,text,area.x,area.y);
-		update_rect(area);
 
 		events::pump();
 		events::raise_process_event();

src/playsingle_controller.cpp

@@ -270,7 +270,6 @@ LEVEL_RESULT playsingle_controller::play_scenario(const config& level)
 				0, 0, gui_->video().getx(), gui_->video().gety(), 0, 0, 0, 1.0,
 				gui_->video().getSurface()
 				);
-			update_rect(0, 0, gui_->video().getx(), gui_->video().gety());
 		}
 
 		ai_testing::log_game_end();

src/sdl/utils.cpp

@@ -2497,7 +2497,6 @@ void surface_restorer::restore(SDL_Rect const &dst) const
 	src.x -= rect_.x;
 	src.y -= rect_.y;
 	sdl_blit(surface_, &src, target_->getSurface(), &dst2);
-	update_rect(dst2);
 }
 
 void surface_restorer::restore() const
@@ -2506,7 +2505,6 @@ void surface_restorer::restore() const
 		return;
 	SDL_Rect dst = rect_;
 	sdl_blit(surface_, nullptr, target_->getSurface(), &dst);
-	update_rect(rect_);
 }
 
 void surface_restorer::update()
@@ -2536,7 +2534,6 @@ void draw_centered_on_background(surface surf, const SDL_Rect& rect, const color
 		r.y = rect.y + (rect.h-surf->h)/2;
 		sdl_blit(surf, nullptr, target, &r);
 	}
-	update_rect(rect);
 }
 
 std::ostream& operator<<(std::ostream& s, const SDL_Rect& rect)

src/show_dialog.cpp

@@ -279,8 +279,6 @@ void dialog_frame::draw_border()
 		video_.blit_surface(dim_.interior.x + dim_.interior.w, dim_.interior.y, right_image);
 	}
 
-	update_rect(dim_.exterior);
-
 	if(top_left_ == nullptr || bot_left_ == nullptr || top_right_ == nullptr || bot_right_ == nullptr) {
 		return;
 	}

src/storyscreen/render.cpp

@@ -249,7 +249,6 @@ bool part_ui::render_floating_images()
 			{
 				floating_image::render_input& old_ri = imgs_[i];
 				sdl_blit(old_ri.image, nullptr, video_.getSurface(), &old_ri.rect);
-				update_rect(old_ri.rect);
 			}
 		}
 		back_button_.set_dirty();
@@ -339,13 +338,6 @@ void part_ui::render_title_box()
 
 	video_.blit_surface(base_rect_.x + titlebox_x, base_rect_.y + titlebox_y, txtsurf);
 
-	update_rect(
-		static_cast<size_t>(std::max(0, base_rect_.x + titlebox_x)),
-		static_cast<size_t>(std::max(0, base_rect_.y + titlebox_y)),
-		static_cast<size_t>(std::max(0, titlebox_w)),
-		static_cast<size_t>(std::max(0, titlebox_h))
-	);
-
 	next_button_.hide(false);
 	back_button_.hide(false);
 	play_button_.hide(false);
@@ -540,12 +532,6 @@ void part_ui::render_story_box()
 			play_button_.hide(false);
 		}
 
-		if (dirty_ || first) {
-			if(!imgs_.empty() && update_area.h > 0) {
-				update_rect(update_area);
-			}
-		}
-
 		// Time to do some visual effecta.
 		if (dirty_ || first) {
 			const int scan_height = 1, scan_width = txtsurf->w;
@@ -567,7 +553,6 @@ void part_ui::render_story_box()
 			//       uses it nonetheless, no idea why...
 			//       Here we'll use CVideo::blit_surface() instead.
 			video_.blit_surface(dstrect.x, dstrect.y, txtsurf, &scan);
-			update_rect(dstrect);
 			++scan.y;
 		}
 		else {

src/video.cpp

@@ -114,52 +114,6 @@ SDL_Rect screen_area()
 	return sdl::create_rect(0, 0, frameBuffer->w, frameBuffer->h);
 }
 
-void update_rect(size_t x, size_t y, size_t w, size_t h)
-{
-	update_rect(sdl::create_rect(x, y, w, h));
-}
-
-void update_rect(const SDL_Rect& rect_value)
-{
-
-	SDL_Rect rect = rect_value;
-
-	surface const fb = nullptr;
-	if(fb != nullptr) {
-		if(rect.x < 0) {
-			if(rect.x*-1 >= rect.w)
-				return;
-
-			rect.w += rect.x;
-			rect.x = 0;
-		}
-
-		if(rect.y < 0) {
-			if(rect.y*-1 >= rect.h)
-				return;
-
-			rect.h += rect.y;
-			rect.y = 0;
-		}
-
-		if(rect.x + rect.w > fb->w) {
-			rect.w = fb->w - rect.x;
-		}
-
-		if(rect.y + rect.h > fb->h) {
-			rect.h = fb->h - rect.y;
-		}
-
-		if(rect.x >= fb->w) {
-			return;
-		}
-
-		if(rect.y >= fb->h) {
-			return;
-		}
-	}
-}
-
 void CVideo::video_event_handler::handle_window_event(const SDL_Event &event)
 {
 	if (event.type == SDL_WINDOWEVENT) {

src/video.hpp

@@ -31,10 +31,6 @@ class surface;
 
 SDL_Rect screen_area();
 
-//which areas of the screen will be updated when the buffer is flipped?
-void update_rect(size_t x, size_t y, size_t w, size_t h);
-void update_rect(const SDL_Rect& rect);
-
 class CVideo {
 public:
 	CVideo(const CVideo&) = delete;

src/widgets/button.cpp

@@ -389,8 +389,6 @@ void button::draw_contents()
 		clipArea.h -= 2*offset;
 		font::draw_text(&video(), clipArea, font_size, button_color, label_text_, textx, texty);
 	}
-
-	update_rect(loc);
 }
 
 bool button::hit(int x, int y) const