Subject: RE: FvwmIdent on Tru64 reports interesting X and Y coordinates...

From: Michael Han <[email-masked]>
Date: Sat, 29 Apr 2000 17:13:45 -0700

Er, forgot to attach a diff...
-- 
[email-masked]                         http://www.best.com/~mikehan/
coffee achiever                              San Francisco, California
Why do we still live here in this repulsive town? All our friends are in New
York." Stephen Merritt

Index: modules/FvwmIconMan/fvwm.c
===================================================================
RCS file: /home/cvs/fvwm/fvwm/modules/FvwmIconMan/fvwm.c,v
retrieving revision 1.27
diff -u -r1.27 fvwm.c
--- modules/FvwmIconMan/fvwm.c  2000/03/24 10:31:56     1.27
+++ modules/FvwmIconMan/fvwm.c  2000/04/29 23:53:28
@@ -20,6 +20,7 @@
 #include "xmanager.h"
 
 #include <libs/Module.h>
+#include <libs/vpacket.h>
 
 static char const rcsid[] =
   "$Id: fvwm.c,v 1.27 2000/03/24 10:31:56 domivogt Exp $";
@@ -34,6 +35,7 @@
   Ulong desknum;
 } m_new_desk_data;
 
+/*
 typedef struct {
   Ulong app_id;
   Ulong frame_id;
@@ -61,6 +63,7 @@
   Ulong back_pixel;
   window_flags flags;
 } m_add_config_data;
+*/
 
 typedef struct {
   Ulong x, y, desknum;
@@ -99,7 +102,7 @@
 typedef union {
   m_toggle_paging_data toggle_paging_data;
   m_new_desk_data      new_desk_data;
-  m_add_config_data    add_config_data;
+  ConfigWinPacket      add_config_data;
   m_new_page_data      new_page_data;
   m_minimal_data       minimal_data;
   m_icon_data          icon_data;
@@ -230,11 +233,11 @@
 
 static void set_win_configuration (WinData *win, FvwmPacketBody *body)
 {
-  win->desknum = body->add_config_data.desknum;
-  win->x = body->add_config_data.xpos;
-  win->y = body->add_config_data.ypos;
-  win->width = body->add_config_data.width;
-  win->height = body->add_config_data.height;
+  win->desknum = body->add_config_data.desk;
+  win->x = body->add_config_data.frame_x;
+  win->y = body->add_config_data.frame_y;
+  win->width = body->add_config_data.frame_width;
+  win->height = body->add_config_data.frame_height;
   win->geometry_set = 1;
   memcpy(&(win->flags), &(body->add_config_data.flags), sizeof(win->flags));
 }
@@ -254,7 +257,7 @@
 
 static void configure_window (FvwmPacketBody *body)
 {
-  Ulong app_id = body->add_config_data.app_id;
+  Ulong app_id = body->add_config_data.w;
   WinData *win;
   ConsoleDebug (FVWM, "configure_window: %ld\n", app_id);
 
@@ -395,7 +398,7 @@
   memcpy(&(win->flags), &(body->add_config_data.flags), sizeof(win->flags));
   if (!(IS_TRANSIENT(win)))
   {
-    win->app_id = body->add_config_data.app_id;
+    win->app_id = body->add_config_data.w;
     win->app_id_set = 1;
     set_win_configuration (win, body);