diff options
| author | marha <marha@users.sourceforge.net> | 2014-08-30 13:45:43 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-08-30 13:45:43 +0200 |
| commit | 3293021e6f582c7348667e7638941620134525e1 (patch) | |
| tree | 5d8d3da8242ff7828fb6964bed19b13d74d48704 /xorg-server/hw/kdrive/ephyr/ephyr.h | |
| parent | 0a9ab140bb01b96888e313466a73e26e5156f22d (diff) | |
| parent | e21655632e3fd40b7f6a5cc3c7f3c379d54557c4 (diff) | |
| download | vcxsrv-3293021e6f582c7348667e7638941620134525e1.tar.gz vcxsrv-3293021e6f582c7348667e7638941620134525e1.tar.bz2 vcxsrv-3293021e6f582c7348667e7638941620134525e1.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/kdrive/ephyr/ephyrinit.c
Diffstat (limited to 'xorg-server/hw/kdrive/ephyr/ephyr.h')
| -rw-r--r-- | xorg-server/hw/kdrive/ephyr/ephyr.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.h b/xorg-server/hw/kdrive/ephyr/ephyr.h index 59e202095..ffe7db1c2 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyr.h +++ b/xorg-server/hw/kdrive/ephyr/ephyr.h @@ -75,8 +75,11 @@ typedef struct _ephyrScrPriv { xcb_window_t win_pre_existing; /* Set via -parent option like xnest */ xcb_window_t peer_win; /* Used for GL; should be at most one */ xcb_image_t *ximg; + Bool win_explicit_position; + int win_x, win_y; int win_width, win_height; int server_depth; + const char *output; /* Set via -output option */ unsigned char *fb_data; /* only used when host bpp != server bpp */ xcb_shm_segment_info_t shminfo; |