commit 6e76cc7622d9708a1e7431d2e4a411750084d9e3
author Kirill K. Smirnov <lich@math.spbu.ru> Tue Dec 18 03:03:11 2007 +0300
committer Alexandre Julliard <julliard@winehq.org> Tue Dec 18 13:30:46 2007 +0100
tree 3a42eb243f4cbb83eaaf2dd20b2736e1ccfd2fdd
parent beb2dfec2c074219116fe8c8e5704a9b41a1ddae

server: Properly notify renderer while activating another screen buffer.

server/console.c

diff --git a/server/console.c b/server/console.c
index a5020ac..b931e05 100644
--- a/server/console.c
+++ b/server/console.c
@@ -302,6 +302,43 @@
     return &console_input->obj;
 }
 
+static void generate_sb_initial_events( struct console_input *console_input )
+{
+    struct screen_buffer *screen_buffer = console_input->active;
+    struct console_renderer_event evt;
+
+    evt.event = CONSOLE_RENDERER_ACTIVE_SB_EVENT;
+    memset(&evt.u, 0, sizeof(evt.u));
+    console_input_events_append( console_input->evt, &evt );
+
+    evt.event = CONSOLE_RENDERER_SB_RESIZE_EVENT;
+    evt.u.resize.width  = screen_buffer->width;
+    evt.u.resize.height = screen_buffer->height;
+    console_input_events_append( console_input->evt, &evt );
+
+    evt.event = CONSOLE_RENDERER_DISPLAY_EVENT;
+    evt.u.display.left   = screen_buffer->win.left;
+    evt.u.display.top    = screen_buffer->win.top;
+    evt.u.display.width  = screen_buffer->win.right - screen_buffer->win.left + 1;
+    evt.u.display.height = screen_buffer->win.bottom - screen_buffer->win.top + 1;
+    console_input_events_append( console_input->evt, &evt );
+
+    evt.event = CONSOLE_RENDERER_UPDATE_EVENT;
+    evt.u.update.top    = 0;
+    evt.u.update.bottom = screen_buffer->height - 1;
+    console_input_events_append( console_input->evt, &evt );
+
+    evt.event = CONSOLE_RENDERER_CURSOR_GEOM_EVENT;
+    evt.u.cursor_geom.size    = screen_buffer->cursor_size;
+    evt.u.cursor_geom.visible = screen_buffer->cursor_visible;
+    console_input_events_append( console_input->evt, &evt );
+
+    evt.event = CONSOLE_RENDERER_CURSOR_POS_EVENT;
+    evt.u.cursor_pos.x = screen_buffer->cursor_x;
+    evt.u.cursor_pos.y = screen_buffer->cursor_y;
+    console_input_events_append( console_input->evt, &evt );
+}
+
 static struct screen_buffer *create_console_output( struct console_input *console_input )
 {
     struct screen_buffer *screen_buffer;
@@ -341,40 +378,8 @@
 
     if (!console_input->active)
     {
-        struct console_renderer_event evt;
 	console_input->active = (struct screen_buffer*)grab_object( screen_buffer );
-
-	/* generate the initial events */
-	evt.event = CONSOLE_RENDERER_ACTIVE_SB_EVENT;
-        memset(&evt.u, 0, sizeof(evt.u));
-	console_input_events_append( console_input->evt, &evt );
-
-	evt.event = CONSOLE_RENDERER_SB_RESIZE_EVENT;
-	evt.u.resize.width  = screen_buffer->width;
-	evt.u.resize.height = screen_buffer->height;
-	console_input_events_append( console_input->evt, &evt );
-
-	evt.event = CONSOLE_RENDERER_DISPLAY_EVENT;
-	evt.u.display.left   = screen_buffer->win.left;
-	evt.u.display.top    = screen_buffer->win.top;
-	evt.u.display.width  = screen_buffer->win.right - screen_buffer->win.left + 1;
-	evt.u.display.height = screen_buffer->win.bottom - screen_buffer->win.top + 1;
-	console_input_events_append( console_input->evt, &evt );
-
-	evt.event = CONSOLE_RENDERER_UPDATE_EVENT;
-	evt.u.update.top    = 0;
-	evt.u.update.bottom = screen_buffer->height - 1;
-	console_input_events_append( console_input->evt, &evt );
-
- 	evt.event = CONSOLE_RENDERER_CURSOR_GEOM_EVENT;
- 	evt.u.cursor_geom.size    = screen_buffer->cursor_size;
- 	evt.u.cursor_geom.visible = screen_buffer->cursor_visible;
- 	console_input_events_append( console_input->evt, &evt );
-
-	evt.event = CONSOLE_RENDERER_CURSOR_POS_EVENT;
-	evt.u.cursor_pos.x = screen_buffer->cursor_x;
-	evt.u.cursor_pos.y = screen_buffer->cursor_y;
-	console_input_events_append( console_input->evt, &evt );
+        generate_sb_initial_events( console_input );
     }
     return screen_buffer;
 }
@@ -665,8 +670,7 @@
 	{
 	    if (console->active) release_object( console->active );
 	    console->active = screen_buffer;
-	    evt.event = CONSOLE_RENDERER_ACTIVE_SB_EVENT;
-	    console_input_events_append( console->evt, &evt );
+	    generate_sb_initial_events( console );
 	}
 	else
 	    release_object( screen_buffer );