some -Txlib fixes

diff --git a/lib/common/emit.c b/lib/common/emit.c
index b26b0387926251ec696b9978849f4641d8fcc96f..623398a7c77ca4e7d276f7f22e0d9d705ad55e8e 100644 (file)
--- a/lib/common/emit.c
+++ b/lib/common/emit.c
@@ -621,6 +621,10 @@ static void init_job_pagination(GVJ_t * job, graph_t *g)
        job->pagesArraySize.x = job->pagesArraySize.y = job->numPages = 1;
     }
 
+    /* initial window size */
+    job->width = (imageSize.x + 2*margin.x) * job->dpi.x / POINTS_PER_INCH;
+    job->height = (imageSize.y + 2*margin.y) * job->dpi.x / POINTS_PER_INCH;
+
     /* determine page box including centering */
     if (GD_drawing(g)->centered) {
        if (pageSize.x > imageSize.x)
@@ -1914,10 +1918,6 @@ static void setup_view(GVJ_t * job, graph_t * g)
 {
     double sx, sy; /* half width, half height in graph-units */
 
-    /* compute width,height in device units */
-    job->width = ROUND((job->view.x + 2 * job->margin.x) * job->dpi.x / POINTS_PER_INCH);
-    job->height = ROUND((job->view.y + 2 * job->margin.y) * job->dpi.y / POINTS_PER_INCH);
-
     job->scale.x = job->zoom * job->dpi.x / POINTS_PER_INCH;
     job->scale.y = job->zoom * job->dpi.y / POINTS_PER_INCH;
 

diff --git a/plugin/xlib/gvdevice_xlib.c b/plugin/xlib/gvdevice_xlib.c
index b0e7538f190aeee373b55589944c28dcd82698df..a1e793754f7cd1a89508ca871faa8efa7f57336b 100644 (file)
--- a/plugin/xlib/gvdevice_xlib.c
+++ b/plugin/xlib/gvdevice_xlib.c
@@ -274,7 +274,6 @@ static void update_display(GVJ_t *job, Display *dpy)
 static void init_window(GVJ_t *job, Display *dpy, int scr)
 {
     int argb = 0;
-    const char *geometry = NULL;
     const char *base = "";
     XGCValues gcv;
     XSetWindowAttributes attributes;
@@ -301,8 +300,10 @@ static void init_window(GVJ_t *job, Display *dpy, int scr)
         attributes.background_pixel = 0;
         attributes.border_pixel = 0;
         attributes.colormap = window->cmap;
-        attributemask = (CWBackPixel |
-                         CWBorderPixel | CWOverrideRedirect | CWColormap);
+        attributemask = ( CWBackPixel
+                          | CWBorderPixel
+                         | CWOverrideRedirect
+                         | CWColormap );
         window->depth = 32;
     } else {
         window->cmap = DefaultColormap(dpy, scr);
@@ -313,11 +314,6 @@ static void init_window(GVJ_t *job, Display *dpy, int scr)
         window->depth = DefaultDepth(dpy, scr);
     }
 
-    if (geometry) {
-        int x, y;
-        XParseGeometry(geometry, &x, &y, &job->width, &job->height);
-    }
-
     window->win = XCreateWindow(dpy, RootWindow(dpy, scr),
                              0, 0, job->width, job->height, 0, window->depth,
                              InputOutput, window->visual,
@@ -499,6 +495,7 @@ static void finalize_xlib(GVJ_t *firstjob)
 
     dpy = (Display *)(firstjob->display);
     scr = firstjob->screen;
+    keycodes = firstjob->keycodes;
 
     inotify_fd = inotify_init();
     if (inotify_fd < 0) {