From a9923d771257359d3d047f3ac7e65f376ffd4564 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Tue, 15 Feb 2005 07:30:44 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=5429
---
 checkin_notes           | 9 +++++++++
 client/app_graphics.C   | 6 +++++-
 client/gui_rpc_server.C | 2 ++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/checkin_notes b/checkin_notes
index b321958f44..364a4c3238 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -24760,3 +24760,12 @@ David  14 Feb 2005
         app_ipc.C,h
         boinc_cmd.C
         gui_rpc_client.C,h
+
+Rom    14 Feb 2005
+    - Use the display information passed from the BOINC Manager and
+        screensaver.
+
+    client/
+        app_graphics.C
+        gui_rpc_server.C
+
diff --git a/client/app_graphics.C b/client/app_graphics.C
index 56c1711128..0a5828092f 100644
--- a/client/app_graphics.C
+++ b/client/app_graphics.C
@@ -38,7 +38,7 @@ void ACTIVE_TASK::request_graphics_mode(GRAPHICS_MSG& m) {
 
     if (!app_client_shm.shm) return;
 
-    graphics_msg = m;       // save graphics_station, desktop
+    graphics_msg = m;       // save graphics_station, desktop, display
 
     strcpy(buf, xml_graphics_modes[m.mode]);
     if (strlen(m.window_station)) {
@@ -49,6 +49,10 @@ void ACTIVE_TASK::request_graphics_mode(GRAPHICS_MSG& m) {
         sprintf(buf2, "<desktop>%s</desktop>", m.desktop);
         strcat(buf, buf2);
     }
+	if (strlen(m.display)) {
+		sprintf(buf2, "<display>%s</display>", m.display);
+        strcat(buf, buf2);
+    }
 
     graphics_request_queue.msg_queue_send(
         buf,
diff --git a/client/gui_rpc_server.C b/client/gui_rpc_server.C
index bf4766b06f..80cb46b3a7 100644
--- a/client/gui_rpc_server.C
+++ b/client/gui_rpc_server.C
@@ -124,6 +124,7 @@ static void handle_result_show_graphics(char* buf, MIOFILE& fout) {
 
     parse_str(buf, "<window_station>", gm.window_station, sizeof(gm.window_station));
     parse_str(buf, "<desktop>", gm.desktop, sizeof(gm.desktop));
+	parse_str(buf, "<display>", gm.display, sizeof(gm.display));
 
     if (parse_str(buf, "<result_name>", result_name)) {
         PROJECT* p = get_project(buf, fout);
@@ -424,6 +425,7 @@ static void handle_set_screensaver_mode(char* buf, MIOFILE& fout) {
     parse_double(buf, "<blank_time>", blank_time);
     parse_str(buf, "<desktop>", gm.desktop, sizeof(gm.desktop));
     parse_str(buf, "<window_station>", gm.window_station, sizeof(gm.window_station));
+	parse_str(buf, "<display>", gm.display, sizeof(gm.display));
     if (match_tag(buf, "<enabled")) {
         gstate.ss_logic.start_ss(gm, blank_time );
     } else {