Changeset 896 for trunk/source/visualization/OpenGL/src/G4OpenGLXViewer.cc

Timestamp:

Dec 3, 2008, 5:31:19 PM (16 years ago)

Author:

garnier

Message:

Modif pour XGeometry complet. Avec debug

File:

• trunk/source/visualization/OpenGL/src/G4OpenGLXViewer.cc (modified) (3 diffs)

trunk/source/visualization/OpenGL/src/G4OpenGLXViewer.cc

@@ -258 +258 @@
 #endif
 
-  size_hints->width = fVP.GetWindowSizeHintX();
-  size_hints->height = fVP.GetWindowSizeHintY();
-  size_hints->flags |= PSize;
+
+  Window root_return;
+  int x_return, y_return;
+  unsigned int width_return, height_return;
+  unsigned int border_width_return;
+  unsigned int depth_return;
+  
+#ifdef G4DEBUG
+  printf("G4OpenGLXViewer::CreateMainWindow 1\n");
+#endif
+  // get the parent window's geometry
+  XGetGeometry(dpy, XRootWindow (dpy, vi -> screen), &root_return, &x_return, &y_return,
+               &width_return, &height_return, &border_width_return,
+               &depth_return);
+  
+#ifdef G4DEBUG
+  printf("G4OpenGLXViewer::CreateMainWindow 2 root W :%d H :%d\n",width_return, height_return);
+#endif
 
   //  G4int                             WinSize_x;
@@ -266 +281 @@
   WinSize_x = fVP.GetWindowSizeHintX();
   WinSize_y = fVP.GetWindowSizeHintY();
-  x_origin = fVP.GetWindowLocationHintX();
-  y_origin = fVP.GetWindowLocationHintY();
-
+  x_origin = fVP.GetWindowAbsoluteLocationHintX(width_return);
+  y_origin = fVP.GetWindowAbsoluteLocationHintY(height_return);
+
+  size_hints->base_width = WinSize_x;
+  size_hints->base_height = WinSize_y;
+  size_hints->x = x_origin;
+  size_hints->y = y_origin;
+  size_hints->flags |= PSize | PPosition;
 #ifdef G4DEBUG
   printf("G4OpenGLXViewer::CreateMainWindow CreateWindow Size:W:%d H:%d X:%d Y:%d \n",WinSize_x,WinSize_y,x_origin,y_origin);
@@ -292 +312 @@
   class_hints -> res_class = NewString("G4OpenGL");
 
-  win = XCreateWindow (dpy, XRootWindow (dpy, vi -> screen), x_origin, 
-                       y_origin, WinSize_x, WinSize_y, 0, vi -> depth,
-                       InputOutput, vi -> visual,  
-                       CWBorderPixel | CWColormap | 
-                       CWEventMask | CWBackingStore,
-                       &swa);
-  
-  XSetWMProperties (dpy, win, &windowName, &iconName, 0, 0, 
-                    size_hints, wm_hints, class_hints);
+   win = XCreateWindow (dpy, XRootWindow (dpy, vi -> screen), x_origin, 
+                        y_origin, WinSize_x, WinSize_y, 0, vi -> depth,
+                        InputOutput, vi -> visual,  
+                        CWBorderPixel | CWColormap | 
+                        CWEventMask | CWBackingStore,
+                        &swa);
+  
+   XSetWMProperties (dpy, win, &windowName, &iconName, 0, 0, 
+                     size_hints, wm_hints, class_hints);
   
 // request X to Draw window on screen.