diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2013-04-27 15:48:31 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2013-04-27 15:48:31 +0200 |
| commit | cb8d170fafa5392f748da396dfb28b30990fe5d7 (patch) | |
| tree | 92b4b2295108ad346a5131cf50966a7233269b5b /hw/kdrive/ephyr/hostx.c | |
| parent | 2cf9484828b76b9516f3cfa80e9da24724959912 (diff) | |
| parent | 10c42f5752d790f745572a3f9fbd2ad7686e1372 (diff) | |
Merge remote-tracking branch 'origin/server-1.13-branch' into obsd-server-1.13-branchobsd-server-1.13-branch
Diffstat (limited to 'hw/kdrive/ephyr/hostx.c')
| -rw-r--r-- | hw/kdrive/ephyr/hostx.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c index 02729d6f6..dfbb9896d 100644 --- a/hw/kdrive/ephyr/hostx.c +++ b/hw/kdrive/ephyr/hostx.c @@ -617,7 +617,8 @@ hostx_set_cmap_entry(unsigned char idx, */ void * hostx_screen_init(EphyrScreenInfo screen, - int width, int height, int buffer_height) + int width, int height, int buffer_height, + int *bytes_per_line, int *bits_per_pixel) { int bitmap_pad; Bool shm_success = False; @@ -694,6 +695,9 @@ hostx_screen_init(EphyrScreenInfo screen, malloc(host_screen->ximg->bytes_per_line * buffer_height); } + *bytes_per_line = host_screen->ximg->bytes_per_line; + *bits_per_pixel = host_screen->ximg->bits_per_pixel; + XResizeWindow(HostX.dpy, host_screen->win, width, height); /* Ask the WM to keep our size static */ |