Author: cazfi
Date: Sun Dec 21 23:15:16 2014
New Revision: 27376
URL: http://svn.gna.org/viewcvs/freeciv?rev=27376&view=rev
Log:
Reworked sdl2-client sdl_dirty_rect(). Renamed it as dirty_sdl_rect() for
clarity.
See patch #5556
Modified:
trunk/client/gui-sdl2/gui_mouse.c
trunk/client/gui-sdl2/mapview.c
trunk/client/gui-sdl2/mapview.h
trunk/client/gui-sdl2/optiondlg.c
trunk/client/gui-sdl2/widget.c
trunk/client/gui-sdl2/widget_core.c
trunk/client/gui-sdl2/wldlg.c
Modified: trunk/client/gui-sdl2/gui_mouse.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/gui_mouse.c?rev=27376&r1=27375&r2=27376&view=diff
==============================================================================
--- trunk/client/gui-sdl2/gui_mouse.c (original)
+++ trunk/client/gui-sdl2/gui_mouse.c Sun Dec 21 23:15:16 2014
@@ -102,7 +102,7 @@
if (options.gui_sdl2_use_color_cursors) {
/* restore background */
if (area.w != 0) {
- flush_rect(area, TRUE);
+ flush_rect(&area, TRUE);
}
if (current_color_cursor.cursor != NULL) {
Modified: trunk/client/gui-sdl2/mapview.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/mapview.c?rev=27376&r1=27375&r2=27376&view=diff
==============================================================================
--- trunk/client/gui-sdl2/mapview.c (original)
+++ trunk/client/gui-sdl2/mapview.c Sun Dec 21 23:15:16 2014
@@ -102,26 +102,26 @@
/**************************************************************************
Flush the given part of the buffer(s) to the screen.
**************************************************************************/
-void flush_rect(SDL_Rect rect, bool force_flush)
+void flush_rect(SDL_Rect *rect, bool force_flush)
{
if (is_flush_queued && !force_flush) {
- sdl_dirty_rect(rect);
+ dirty_sdl_rect(rect);
} else {
static SDL_Rect src, dst;
- if (correct_rect_region(&rect)) {
+ if (correct_rect_region(rect)) {
static int i = 0;
- dst = rect;
+ dst = *rect;
if (C_S_RUNNING == client_state()) {
flush_mapcanvas(dst.x, dst.y, dst.w, dst.h);
}
- alphablit(Main.map, &rect, Main.mainsurf, &dst, 255);
+ alphablit(Main.map, rect, Main.mainsurf, &dst, 255);
if (Main.guis) {
while ((i < Main.guis_count) && Main.guis[i]) {
- src = rect;
+ src = *rect;
screen_rect_to_layer_rect(Main.guis[i], &src);
- dst = rect;
+ dst = *rect;
alphablit(Main.guis[i++]->surface, &src, Main.mainsurf, &dst, 255);
}
}
@@ -129,8 +129,8 @@
/* flush main buffer to framebuffer */
#if 0
- SDL_UpdateRect(Main.screen, rect.x, rect.y, rect.w, rect.h);
-#endif
+ SDL_UpdateRect(Main.screen, rect->x, rect->y, rect->w, rect->h);
+#endif /* 0 */
}
}
}
@@ -176,19 +176,16 @@
{
SDL_Rect Rect = {canvas_x, canvas_y, pixel_width, pixel_height};
- if ((Main.rects_count < RECT_LIMIT) && correct_rect_region(&Rect)) {
- Main.rects[Main.rects_count++] = Rect;
- queue_flush();
- }
+ dirty_sdl_rect(&Rect);
}
/**************************************************************************
Save Flush rect used by "end" flush.
**************************************************************************/
-void sdl_dirty_rect(SDL_Rect Rect)
-{
- if ((Main.rects_count < RECT_LIMIT) && correct_rect_region(&Rect)) {
- Main.rects[Main.rects_count++] = Rect;
+void dirty_sdl_rect(SDL_Rect *Rect)
+{
+ if ((Main.rects_count < RECT_LIMIT) && correct_rect_region(Rect)) {
+ Main.rects[Main.rects_count++] = *Rect;
queue_flush();
}
}
@@ -474,12 +471,12 @@
putline(Main.gui->surface,
area.x, area.y + 1, area.x, area.y + area.h - 2,
get_theme_color(COLOR_THEME_MAPVIEW_INFO_FRAME));
-#endif
+#endif /* 0 */
/* blit text to screen */
blit_entire_src(pTmp, Main.gui->surface, area.x + adj_size(5), area.y +
adj_size(2));
- sdl_dirty_rect(area);
+ dirty_sdl_rect(&area);
FREESURFACE(pTmp);
}
Modified: trunk/client/gui-sdl2/mapview.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/mapview.h?rev=27376&r1=27375&r2=27376&view=diff
==============================================================================
--- trunk/client/gui-sdl2/mapview.h (original)
+++ trunk/client/gui-sdl2/mapview.h Sun Dec 21 23:15:16 2014
@@ -35,8 +35,8 @@
void toggle_overview_mode(void);
void refresh_overview(void);
-void flush_rect(SDL_Rect rect, bool force_flush);
-void sdl_dirty_rect(SDL_Rect rect);
+void flush_rect(SDL_Rect *rect, bool force_flush);
+void dirty_sdl_rect(SDL_Rect *rect);
void unqueue_flush(void);
void queue_flush(void);
void flush_all(void);
Modified: trunk/client/gui-sdl2/optiondlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/optiondlg.c?rev=27376&r1=27375&r2=27376&view=diff
==============================================================================
--- trunk/client/gui-sdl2/optiondlg.c (original)
+++ trunk/client/gui-sdl2/optiondlg.c Sun Dec 21 23:15:16 2014
@@ -163,7 +163,7 @@
area = window->area;
area.w += window->size.x;
area.h += window->size.y;
- sdl_dirty_rect(area);
+ dirty_sdl_rect(&area);
/* Resize window. */
logo = theme_get_background(theme, BACKGROUND_OPTIONDLG);
@@ -1250,7 +1250,7 @@
area = window->area;
area.w += window->size.x;
area.h += window->size.y;
- sdl_dirty_rect(area);
+ dirty_sdl_rect(&area);
/* Resize window. */
resize_window(window, NULL, NULL,
Modified: trunk/client/gui-sdl2/widget.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/widget.c?rev=27376&r1=27375&r2=27376&view=diff
==============================================================================
--- trunk/client/gui-sdl2/widget.c (original)
+++ trunk/client/gui-sdl2/widget.c Sun Dec 21 23:15:16 2014
@@ -306,7 +306,7 @@
widget_info_counter = 0;
if (pInfo_Area) {
- sdl_dirty_rect(*pInfo_Area);
+ dirty_sdl_rect(pInfo_Area);
FC_FREE(pInfo_Area);
FREESURFACE(info_label);
}
@@ -440,7 +440,7 @@
}
if (pInfo_Area) {
- flush_rect(*pInfo_Area, FALSE);
+ flush_rect(pInfo_Area, FALSE);
FC_FREE(pInfo_Area);
FREESURFACE(info_label);
}
Modified: trunk/client/gui-sdl2/widget_core.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/widget_core.c?rev=27376&r1=27375&r2=27376&view=diff
==============================================================================
--- trunk/client/gui-sdl2/widget_core.c (original)
+++ trunk/client/gui-sdl2/widget_core.c Sun Dec 21 23:15:16 2014
@@ -191,7 +191,7 @@
pwidget->size.h
};
- sdl_dirty_rect(rect);
+ dirty_sdl_rect(&rect);
}
/**************************************************************************
@@ -206,7 +206,7 @@
pwidget->size.h
};
- flush_rect(rect, FALSE);
+ flush_rect(&rect, FALSE);
}
/**************************************************************************
Modified: trunk/client/gui-sdl2/wldlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/wldlg.c?rev=27376&r1=27375&r2=27376&view=diff
==============================================================================
--- trunk/client/gui-sdl2/wldlg.c (original)
+++ trunk/client/gui-sdl2/wldlg.c Sun Dec 21 23:15:16 2014
@@ -952,7 +952,7 @@
}
widget_redraw(pEditor->pProduction_Name);
- sdl_dirty_rect(area);
+ dirty_sdl_rect(&area);
FREESURFACE(pEditor->pProduction_Progres->theme);
pEditor->pProduction_Progres->theme =
@@ -991,7 +991,7 @@
area.y = pEditor->pWorkList_Counter->size.y;
area.w = adj_size(130);
area.h = pEditor->pWorkList_Counter->size.h;
- sdl_dirty_rect(area);
+ dirty_sdl_rect(&area);
}
/* ====================================================================== */
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
