Merge pull request #17 from schwicke/main

Support off-screen hardcopies with scaling

Author: matthiasschroder

README.md

@@ -57,6 +57,9 @@ where X is a floating point number between 0. (fully transparent) and 1. (fully
 ## Migration notes and extensions
 Some notes on differences with respect to other implementations.
 
+### Workstation numbers
+Workstation numbers can be in the range from 0 to 99.
+
 ### Workstation types
 * 0 PWST_OUTPUT_TRUE                 Output only on GL display
 * 1 PWST_OUTIN_TRUE                  Input/Output on GL display
@@ -65,9 +68,9 @@ Some notes on differences with respect to other implementations.
 * 4 PWST_HCOPY_TRUE                  Hardcopy to file as TGA
 * 5 PWST_HCOPY_TRUE_DB               Hardcopy to file as TGA
 * 6 PWST_HCOPY_TRUE_RGB_PNG          Hardcopy to file as PNG RGB only
-* 7 PWST_HCOPY_TRUE_RGB_PNG_DB       Hardcopy to file as PNG RGB only
+* 7 PWST_HCOPY_TRUE_RGB_PNG_DB       Hardcopy to file as PNG RGB only, same as 6
 * 8 PWST_HCOPY_TRUE_RGBA_PNG         Hardcopy to file as PNG with Alpha channel
-* 9 PWST_HCOPY_TRUE_RGBA_PNG_DB      Hardcopy to file as PNG with Alpha channel
+* 9 PWST_HCOPY_TRUE_RGBA_PNG_DB      Hardcopy to file as PNG with Alpha channel, same as 6
 
 Notes:
  * There is no support for PostScript at the moment.
@@ -99,6 +102,7 @@ Openphigs behaviour on echo modes is summarized below.
   * low label
   * high label
   These should be encoded
+
 Extensions:
 * echo mode 2:
   * as echo mode 1 but places the window on top of the main window

phigs.def

@@ -0,0 +1,22 @@
+Example Parameters for workstation 1
+Enabled switches: %XX, Comment by replacing the % by some other character
+
+Global flags:
+%gs 1                 Use shaders (1) or not (0)
+%pc 1                 print configuration. Set to 0 to disable.
+
+Per workstation configurations
+
+%wk 1                 workstation for rendering
+%wf fort.10           default output file name for hardcopies
+%wn OpenPHIGS         workstation name
+%wi PHIGS             workstation icon name
+%wp 0.0 1.0 0.0 1.    position
+%wg 512 512 0 0 1     Window width height px py border
+%bg 0. 0. 0.          Background color R G B
+%hs 4.
+
+Workstation example for output
+%wk 99                Workstation for hardcopy
+%wg 512 512 0 0 1     Window width height px py border
+%hs 8.                scale factor for hardcopy

src/include/phigs/phconf.h

@@ -28,17 +28,18 @@ extern "C" {
 
   static  int max_text = 30;
   typedef struct {
-    int wkid;
-    char window_title[30];
+    int wkid; /* workstation ID */
+    char window_title[30]; /* Window title */
     char window_icon[30];
-    char filename[512];
+    char filename[512];   /* Output filename for hard copies */
     int  set_window_pos;
     Plimit vpos;
     Pcolr_rep background_color;
     unsigned int display_width;
     unsigned int display_height;
     unsigned int border_width;
     int xpos, ypos;
+    float hcsf; /* hard copy scale factor */
   } Pophconf;
 
   /* configuration file name */

src/include/phigs/phgargs.h

@@ -182,6 +182,7 @@ typedef struct _Phg_args_open_ws {
    unsigned int       width, height, border_width;
    int                x, y;
    Plimit             limits;
+   float              hcsf;
 } Phg_args_open_ws;
 
 typedef struct {

src/include/phigs/private/wsxP.h

@@ -52,6 +52,29 @@ int phg_wsx_setup_tool(
    Wst *wst
    );
 
+/*******************************************************************************
+ * phg_wsx_setup_tool_nodisp
+ *
+ * DESCR:       Create window
+ * RETURNS:     TRUE or FALSE
+ */
+
+int phg_wsx_setup_tool_nodisp(
+   Ws *ws,
+   Phg_args_conn_info *conn_info,
+   Phg_args_open_ws *args
+   );
+
+/*******************************************************************************
+ * phg_wsx_cleanup_fb
+ *
+ * DESCR:       Release window
+ * RETURNS:     N/A
+ */
+void phg_wsx_cleanup_fb(
+                        Ws *ws
+                        );
+
 /*******************************************************************************
  * phg_wsx_release_window
  *
@@ -86,6 +109,22 @@ Display* phg_wsx_open_gl_display(
    Pint *err_ind
    );
 
+/*******************************************************************************
+ * phg_wsx_set_best_args
+ *
+ * DESCR:	Find best matching visual
+ * RETURNS:	status as true or false
+ *              Fills args array
+ */
+
+int phg_wsx_set_best_args(
+   Ws *ws,
+   Wst *wst,
+   int* args,
+   int* rargc,
+   int* err_ind
+);
+
 /*******************************************************************************
  * phg_wsx_find_best_visual
  *
@@ -194,4 +233,3 @@ int phg_wstx_init(
 #endif /* __cplusplus */
 
 #endif /* _wsxP_h */
-

src/include/phigs/psl.h

@@ -56,8 +56,8 @@ SOFTWARE.
 extern "C" {
 #endif
 
-#define MAX_NO_OPEN_WS                         20
-#define MAX_NO_OPEN_ARFILES                    20
+#define MAX_NO_OPEN_WS                         100
+#define MAX_NO_OPEN_ARFILES                    100
 
 typedef struct {
    Pint       used;                            /* Mark if workstation is used */

src/include/phigs/ws.h

@@ -240,9 +240,13 @@ typedef struct _Ws {
    Widget       valuator_shell;
    Widget       valuator_box;
    Widget       valuator_frame;
+   GLXFBConfig  *fbc;
+   GLuint       fbuf, depthbuf, colorbuf;
+   GLint        old_viewport[4];
 
    /* Output LUN for some work station types, e.g. to print out stuff here */
-   Pint           lun;
+   Pint         lun;
+   Pfloat       hcsf;
    /* File name */
    char         filename[512];
    void         (*close)(