Attachment 250 Details for Bug 558 – Patch for 2004-04-26-trunk

[patch] Patch for 2004-04-26-trunk

patch.gudiff (text/plain), 16.63 KB, created by Roland Mainz on 2004-04-30 08:58:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-04-30 08:58:31 UTC

Size: 16.63 KB

patch

obsolete

>Index: xc/ChangeLog
>===================================================================
>RCS file: /cvs/xorg/xc/ChangeLog,v
>retrieving revision 1.11
>diff -u -r1.11 ChangeLog
>--- a/xc/ChangeLog	28 Apr 2004 10:38:57 -0000	1.11
>+++ b/xc/ChangeLog	29 Apr 2004 22:54:46 -0000
>@@ -1,3 +1,8 @@
>+2004-04-30 Roland Mainz <roland.mainz@nrubsig.org>
>+        * xc/programs/glxgears/Imakefile
>+        * xc/programs/glxgears/glxgears.c
>+        BugZilla #558: Add print support to glxgears.
>+
> 2004-04-28 Roland Mainz <roland.mainz@nrubsig.org>
>         * xc/extras/freetype2/ChangeLog
>         * xc/extras/freetype2/Jamfile
>Index: xc/programs/glxgears/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/glxgears/Imakefile,v
>retrieving revision 1.2
>diff -u -r1.2 Imakefile
>--- a/xc/programs/glxgears/Imakefile	23 Apr 2004 19:54:33 -0000	1.2
>+++ b/xc/programs/glxgears/Imakefile	29 Apr 2004 22:54:59 -0000
>@@ -1,8 +1,8 @@
> XCOMM $XConsortium: Imakefile /main/7 1995/12/04 15:10:00 dpw $
> XCOMM $XFree86: xc/programs/glxinfo/Imakefile,v 1.3 2001/03/21 20:56:32 dawes Exp $
> #include <Threads.tmpl>
>-        DEPLIBS = $(DEPGLXLIB) $(DEPXLIB)
>-LOCAL_LIBRARIES = $(GLXLIB) $(XLIB) 
>+        DEPLIBS = $(DEPGLXLIB) $(DEPXPLIB) $(DEPXLIB)
>+LOCAL_LIBRARIES = $(GLXLIB) $(XPLIB) -lXprintUtil $(XLIB)
>   SYS_LIBRARIES = MathLibrary
> 
> SimpleProgramTarget(glxgears)
>Index: xc/programs/glxgears/glxgears.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/glxgears/glxgears.c,v
>retrieving revision 1.2
>diff -u -r1.2 glxgears.c
>--- a/xc/programs/glxgears/glxgears.c	23 Apr 2004 19:54:33 -0000	1.2
>+++ b/xc/programs/glxgears/glxgears.c	29 Apr 2004 22:55:00 -0000
>@@ -29,25 +29,63 @@
>  *
>  */
> 
>-
>-#include <math.h>
>-#include <stdlib.h>
>-#include <stdio.h>
>-#include <string.h>
> #include <X11/Xlib.h>
>+#include <X11/Xutil.h>
>+#include <X11/XprintUtil/xprintutil.h>
> #include <X11/keysym.h>
> #include <GL/gl.h>
> #include <GL/glx.h>
>+#include <math.h>
>+#include <stdlib.h>
>+#include <stdio.h>
>+#include <string.h>
>+#include <ctype.h>
>+#include <math.h>
>+
>+/* XXX this probably isn't very portable */
>+#include <sys/time.h>
>+#include <unistd.h>
> 
>+#ifndef M_PI
>+#define M_PI 3.14159265
>+#endif /* !M_PI */
> 
>-#define BENCHMARK
>+/* Turn a NULL pointer string into an empty string */
>+#define NULLSTR(x) (((x)!=NULL)?(x):(""))
>+#define Log(x) { if(verbose) printf x; }
>+
>+/* Globla vars */ 
>+static const char *ProgramName;      /* program name (from argv[0]) */
>+static Bool        verbose = False;  /* verbose output what the program is doing */
>+ 
>+int                xp_event_base,      /* XpExtension even base */
>+                   xp_error_base;      /* XpExtension error base */
> 
>-#ifdef BENCHMARK
>+static GLfloat view_rotx = 20.0, view_roty = 30.0, view_rotz = 0.0;
>+static GLint gear1, gear2, gear3;
>+static GLfloat angle = 0.0;
>+static GLboolean printInfo = GL_FALSE;
> 
>-/* XXX this probably isn't very portable */
>+static
>+void usage(void)
>+{
>+   fprintf (stderr, "usage:  %s [options]\n", ProgramName);
>+   fprintf (stderr, "-display\tSet X11 display for output.\n");
>+   fprintf (stderr, "-print\tUse printer instead of video card for output.\n");
>+   fprintf (stderr, "-printer printername\tname of printer to use\n");
>+   fprintf (stderr, "-printfile printername\tOutput file for print job\n");
>+   fprintf (stderr, "-numpages count\tNumber of pages to print\n");
>+   fprintf (stderr, "-info\tPrint additional GLX information.\n");
>+   fprintf (stderr, "-h\tPrint this help page.\n");
>+   fprintf (stderr, "-v\tVerbose output.\n");
>+   fprintf (stderr, "\n");
>+   exit(EXIT_FAILURE);
>+}
> 
>-#include <sys/time.h>
>-#include <unistd.h>
>+
>+#define BENCHMARK
>+
>+#ifdef BENCHMARK
> 
> /* return current time (in seconds) */
> static int
>@@ -59,7 +97,7 @@
>    return (int) tv.tv_sec;
> }
> 
>-#else /*BENCHMARK*/
>+#else /* BENCHMARK */
> 
> /* dummy */
> static int
>@@ -68,19 +106,7 @@
>    return 0;
> }
> 
>-#endif /*BENCHMARK*/
>-
>-
>-
>-#ifndef M_PI
>-#define M_PI 3.14159265
>-#endif
>-
>-
>-static GLfloat view_rotx = 20.0, view_roty = 30.0, view_rotz = 0.0;
>-static GLint gear1, gear2, gear3;
>-static GLfloat angle = 0.0;
>-
>+#endif /* BENCHMARK */
> 
> /*
>  *
>@@ -311,7 +337,8 @@
>  * Return the window and context handles.
>  */
> static void
>-make_window( Display *dpy, const char *name,
>+make_window( Display *dpy, Screen *scr,
>+             const char *name,
>              int x, int y, int width, int height,
>              Window *winRet, GLXContext *ctxRet)
> {
>@@ -329,14 +356,15 @@
>    Window win;
>    GLXContext ctx;
>    XVisualInfo *visinfo;
>+   GLint max[2] = { 0, 0 };
> 
>-   scrnum = DefaultScreen( dpy );
>-   root = RootWindow( dpy, scrnum );
>+   scrnum = XScreenNumberOfScreen(scr);
>+   root   = XRootWindow(dpy, scrnum);
> 
>    visinfo = glXChooseVisual( dpy, scrnum, attrib );
>    if (!visinfo) {
>-      printf("Error: couldn't get an RGB, Double-buffered visual\n");
>-      exit(1);
>+      fprintf(stderr, "%s: Error: couldn't get an RGB, Double-buffered visual.\n", ProgramName);
>+      exit(EXIT_FAILURE);
>    }
> 
>    /* window attributes */
>@@ -346,7 +374,7 @@
>    attr.event_mask = StructureNotifyMask | ExposureMask | KeyPressMask;
>    mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
> 
>-   win = XCreateWindow( dpy, root, 0, 0, width, height,
>+   win = XCreateWindow( dpy, root, x, y, width, height,
> 		        0, visinfo->depth, InputOutput,
> 		        visinfo->visual, mask, &attr );
> 
>@@ -365,54 +393,71 @@
> 
>    ctx = glXCreateContext( dpy, visinfo, NULL, True );
>    if (!ctx) {
>-      printf("Error: glXCreateContext failed\n");
>-      exit(1);
>+      fprintf(stderr, "%s: Error: glXCreateContext failed.\n", ProgramName);
>+      exit(EXIT_FAILURE);
>    }
> 
>    XFree(visinfo);
> 
>+   XMapWindow(dpy, win);
>+   glXMakeCurrent(dpy, win, ctx);
>+
>+   /* Check for maximum size supported by the GL rasterizer */   
>+   glGetIntegerv(GL_MAX_VIEWPORT_DIMS, max);
>+   if (printInfo)
>+      printf("GL_MAX_VIEWPORT_DIMS=%d/%d\n", (int)max[0], (int)max[1]);
>+   if (width > max[0] || height > max[1]) {
>+      fprintf(stderr, "%s: Error: Requested window size (%d/%d) larger than "
>+              "maximum supported by GL engine (%d/%d).\n",
>+              ProgramName, width, height, (int)max[0], (int)max[1]);
>+      exit(EXIT_FAILURE);
>+   }
>+
>    *winRet = win;
>    *ctxRet = ctx;
> }
> 
> 
> static void
>-event_loop(Display *dpy, Window win)
>+event_loop(Display *dpy, Window win, int numPages )
> {
>    while (1) {
>-      while (XPending(dpy) > 0) {
>-         XEvent event;
>-         XNextEvent(dpy, &event);
>-         switch (event.type) {
>-	 case Expose:
>-            /* we'll redraw below */
>-	    break;
>-	 case ConfigureNotify:
>-	    reshape(event.xconfigure.width, event.xconfigure.height);
>-	    break;
>-         case KeyPress:
>-            {
>-               char buffer[10];
>-               int code;
>-               code = XLookupKeysym(&event.xkey, 0);
>-               if (code == XK_Left) {
>-                  view_roty += 5.0;
>-               }
>-               else if (code == XK_Right) {
>-                  view_roty -= 5.0;
>-               }
>-               else if (code == XK_Up) {
>-                  view_rotx += 5.0;
>-               }
>-               else if (code == XK_Down) {
>-                  view_rotx -= 5.0;
>-               }
>-               else {
>-                  (void) XLookupString(&event.xkey, buffer, sizeof(buffer),
>-                                    NULL, NULL);
>-                  if (buffer[0] == 27) {
>-                     /* escape */
>-                     return;
>+      /* Process interactive events only when we are not printing */
>+      if (numPages == 0) {
>+         while (XPending(dpy) > 0) {
>+            XEvent event;
>+            XNextEvent(dpy, &event);
>+            switch (event.type) {
>+	    case Expose:
>+               /* we'll redraw below */
>+	       break;
>+	    case ConfigureNotify:
>+	       reshape(event.xconfigure.width, event.xconfigure.height);
>+	       break;
>+            case KeyPress:
>+               {
>+                  char buffer[10];
>+                  int code;
>+                  code = XLookupKeysym(&event.xkey, 0);
>+                  if (code == XK_Left) {
>+                     view_roty += 5.0;
>+                  }
>+                  else if (code == XK_Right) {
>+                     view_roty -= 5.0;
>+                  }
>+                  else if (code == XK_Up) {
>+                     view_rotx += 5.0;
>+                  }
>+                  else if (code == XK_Down) {
>+                     view_rotx -= 5.0;
>+                  }
>+                  else {
>+                     (void) XLookupString(&event.xkey, buffer, sizeof(buffer),
>+                                       NULL, NULL);
>+                     if (buffer[0] == 27) {
>+                        /* escape */
>+                        return;
>+                     }
>                   }
>                }
>             }
>@@ -422,9 +467,23 @@
>       /* next frame */
>       angle += 2.0;
> 
>+      if (numPages > 0) {
>+         XpStartPage(dpy, win);
>+         XpuWaitForPrintNotify(dpy, xp_event_base, XPStartPageNotify);      
>+      }
>+
>       draw();
>       glXSwapBuffers(dpy, win);
> 
>+      if (numPages > 0) {
>+         XpEndPage(dpy);
>+         XpuWaitForPrintNotify(dpy, xp_event_base, XPEndPageNotify);
>+
>+         /* Last page ? */          
>+         if( --numPages == 0 )
>+            return;
>+      }
>+           
>       /* calc framerate */
>       {
>          static int t0 = -1;
>@@ -452,33 +511,181 @@
> int
> main(int argc, char *argv[])
> {
>-   Display *dpy;
>-   Window win;
>-   GLXContext ctx;
>-   char *dpyName = NULL;
>-   GLboolean printInfo = GL_FALSE;
>-   int i;
>+   Display       *dpy;
>+   Window         win;
>+   XPContext      pcontext           = None; /* Xprint context */
>+   void          *printtofile_handle = NULL; /* "context" when printing to file */
>+   long           dpi;
>+   Screen        *screen;
>+   GLXContext     ctx;
>+   char          *dpyName            = NULL;
>+   int            i;
>+   Bool           doPrint            = FALSE; /* Print to printer ? */
>+   const char    *printername        = NULL;  /* printer to query */
>+   const char    *toFile             = NULL;  /* output file (instead of printer) */
>+   int            numPages           = 5;     /* Numer of pages to print */
>+   XPPrinterList  plist              = NULL;  /* list of printers */
>+   int            plist_count;                /* number of entries in |plist|-array */
>+   unsigned short dummy;
>+   XRectangle     winrect;
> 
>+   ProgramName = argv[0];
>+    
>    for (i = 1; i < argc; i++) {
>+      const char *arg = argv[i];
>+      int         len = strlen(arg);
>+
>       if (strcmp(argv[i], "-display") == 0) {
>-         dpyName = argv[i+1];
>-         i++;
>+         if (++i >= argc)
>+            usage();
>+         dpyName = argv[i];
>       }
>       else if (strcmp(argv[i], "-info") == 0) {
>          printInfo = GL_TRUE;
>       }
>+      else if (strcmp(argv[i], "-print") == 0) {
>+         doPrint = True;
>+      }
>+      else if (!strncmp("-printer", arg, len)) {
>+         if (++i >= argc)
>+            usage();
>+         printername = argv[i];
>+         doPrint = True;
>+      }
>+      else if (!strncmp("-printfile", arg, len)) {
>+         if (++i >= argc)
>+            usage();
>+         toFile = argv[i];
>+         doPrint = True;
>+      }
>+      else if (!strncmp("-numpages", arg, len)) {
>+         if (++i >= argc)
>+            usage();
>+         numPages = atoi(argv[i]);
>+         doPrint = True;
>+         if (numPages <= 0)
>+            usage();
>+      }
>+      else if (!strncmp("-v", arg, len)) {
>+         verbose   = True;
>+         printInfo = GL_TRUE;
>+      }
>+      else if (strcmp(argv[i], "-h") == 0) {
>+         usage();
>+      }
>+      else
>+      {
>+        fprintf(stderr, "%s: Unsupported option '%s'.\n", ProgramName, argv[i]);
>+        usage();
>+      }
>    }
>+   
>+   /* Display and printing at the same time not implemented */
>+   if (doPrint && dpyName) {
>+      usage();
>+   }
>+
>+   if (doPrint) {
>+      plist = XpuGetPrinterList(printername, &plist_count);
>+
>+      if (!plist) {
>+         fprintf(stderr, "%s:  no printers found for printer spec \"%s\".\n",
>+                 ProgramName, NULLSTR(printername));
>+         return EXIT_FAILURE;
>+      }
>+
>+      printername = plist[0].name;
>+
>+      Log(("Using printer '%s'\n", printername));
>+
>+      if (XpuGetPrinter(printername, &dpy, &pcontext) != 1) {
>+         fprintf(stderr, "%s: Cannot open printer '%s'\n", ProgramName, printername);
>+         return EXIT_FAILURE;
>+      }
>+
>+      if (XpQueryExtension(dpy, &xp_event_base, &xp_error_base) == False) {
>+         fprintf(stderr, "%s: XpQueryExtension() failed.\n", ProgramName);
>+         XpuClosePrinterDisplay(dpy, pcontext);
>+         return EXIT_FAILURE;
>+      }
> 
>-   dpy = XOpenDisplay(dpyName);
>-   if (!dpy) {
>-      printf("Error: couldn't open display %s\n", dpyName);
>-      return -1;
>+      /* Listen to XP(Start|End)(Job|Doc|Page)Notify events).
>+       * This is mantatory as Xp(Start|End)(Job|Doc|Page) functions are _not_ 
>+       * syncronous !!
>+       * Not waiting for such events may cause that subsequent data may be 
>+       * destroyed/corrupted!!
>+       */
>+      XpSelectInput(dpy, pcontext, XPPrintMask);
>+
>+      /* Set job title */
>+      XpuSetJobTitle(dpy, pcontext, "glxgears for Xprint");
>+
>+      /* Set print context
>+       * Note that this modifies the available fonts, including builtin printer prints.
>+       * All XListFonts()/XLoadFont() stuff should be done _after_ setting the print 
>+       * context to obtain the proper fonts.
>+       */ 
>+      XpSetContext(dpy, pcontext);
>+
>+      /* Get default printer reolution */   
>+      if (XpuGetResolution(dpy, pcontext, &dpi) != 1) {
>+         fprintf(stderr, "%s: No default resolution for printer '%s'.\n",
>+         ProgramName, printername);
>+         XpuClosePrinterDisplay(dpy, pcontext);
>+         return EXIT_FAILURE;
>+      }
>+
>+      if (toFile) {
>+         Log(("starting job (to file '%s').\n", toFile));
>+         printtofile_handle = XpuStartJobToFile(dpy, pcontext, toFile);
>+         if( !printtofile_handle ) {
>+            fprintf(stderr, "%s: Error: %s while trying to print to file.\n", 
>+                    ProgramName, strerror(errno));
>+            XpuClosePrinterDisplay(dpy, pcontext);
>+            return EXIT_FAILURE;
>+         }
>+
>+         XpuWaitForPrintNotify(dpy, xp_event_base, XPStartJobNotify);
>+      }
>+      else
>+      {
>+         Log(("starting job.\n"));
>+         XpuStartJobToSpooler(dpy);    
>+         XpuWaitForPrintNotify(dpy, xp_event_base, XPStartJobNotify);
>+      }
>+
>+      screen = XpGetScreenOfContext(dpy, pcontext);
>+
>+      /* Obtain some info about page geometry */
>+      XpGetPageDimensions(dpy, pcontext, &dummy, &dummy, &winrect);
>+
>+      /* Center output window on page */
>+      winrect.width  /= 2;
>+      winrect.height /= 2;
>+      winrect.x += winrect.width  / 2;
>+      winrect.y += winrect.height / 2;
>    }
>+   else
>+   {
>+      dpy = XOpenDisplay(dpyName);
>+      if (!dpy) {
>+         fprintf(stderr, "%s: Error: couldn't open display '%s'\n", ProgramName, dpyName);
>+         return EXIT_FAILURE;
>+      }
> 
>-   make_window(dpy, "glxgears", 0, 0, 300, 300, &win, &ctx);
>-   XMapWindow(dpy, win);
>-   glXMakeCurrent(dpy, win, ctx);
>-   reshape(300, 300);
>+      screen = XDefaultScreenOfDisplay(dpy);
>+
>+      winrect.x      = 0;
>+      winrect.y      = 0;
>+      winrect.width  = 300;
>+      winrect.height = 300;
>+   }
>+   
>+   Log(("Window x=%d, y=%d, width=%d, height=%d\n",
>+       (int)winrect.x, (int)winrect.y, (int)winrect.width, (int)winrect.height));
>+
>+   make_window(dpy, screen, "glxgears", winrect.x, winrect.y, winrect.width, winrect.height, &win, &ctx);
>+   reshape(winrect.width, winrect.height);
> 
>    if (printInfo) {
>       printf("GL_RENDERER   = %s\n", (char *) glGetString(GL_RENDERER));
>@@ -489,11 +696,37 @@
> 
>    init();
> 
>-   event_loop(dpy, win);
>+   event_loop(dpy, win, doPrint?numPages:0);
> 
>    glXDestroyContext(dpy, ctx);
>-   XDestroyWindow(dpy, win);
>-   XCloseDisplay(dpy);
> 
>-   return 0;
>+   if (doPrint) {
>+      /* End the print job - the final results are sent by the X print
>+       * server to the spooler sub system.
>+       */
>+      XpEndJob(dpy);
>+      XpuWaitForPrintNotify(dpy, xp_event_base, XPEndJobNotify);    
>+      Log(("end job.\n"));
>+
>+      if (toFile) {
>+         if (XpuWaitForPrintFileChild(printtofile_handle) != XPGetDocFinished) {
>+            fprintf(stderr, "%s: Error while printing to file.\n", ProgramName);
>+            XpuClosePrinterDisplay(dpy, pcontext);
>+            return EXIT_FAILURE;
>+         }
>+      }
>+
>+      XDestroyWindow(dpy, win);
>+      XpuClosePrinterDisplay(dpy, pcontext);
>+
>+      XpuFreePrinterList(plist);
>+   }
>+   else 
>+   {
>+      XDestroyWindow(dpy, win);
>+      XCloseDisplay(dpy);
>+   }
>+   
>+   return EXIT_SUCCESS;
> }
>+

Actions: View | Splinter Review

Attachments on bug 558: 250

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.