frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XEphyr -parent switch fixes

This commit is contained in:
Matthew Allum 2004-11-24 17:08:06 +00:00
parent a7a07d0c71
commit a96254234f
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/kdrive/ephyr/ephyr.c
View File

@ -339,7 +339,7 @@ ephyrRandRGetInfo (ScreenPtr pScreen, Rotation *rotations)
{ 1400, 1050 }, { 1400, 1050 },
{ 1280, 960 }, { 1280, 960 },
{ 1280, 1024 }, { 1280, 1024 },
{ 1152, 768 }, { 1152, 864 },
{ 1024, 768 }, { 1024, 768 },
{ 832, 624 }, { 832, 624 },
{ 800, 600 }, { 800, 600 },

15
hw/kdrive/ephyr/hostx.c
View File

@ -229,7 +229,10 @@ hostx_init(void)
hostx_errors_trap(); hostx_errors_trap();
result = XGetWindowAttributes(HostX.dpy, HostX.win, &prewin_attr); result = XGetWindowAttributes(HostX.dpy,
HostX.win_pre_existing,
&prewin_attr);
if (hostx_errors_untrap() || !result) if (hostx_errors_untrap() || !result)
{ {
@ -240,7 +243,15 @@ hostx_init(void)
HostX.win_width = prewin_attr.width; HostX.win_width = prewin_attr.width;
HostX.win_height = prewin_attr.height; HostX.win_height = prewin_attr.height;
XSelectInput(HostX.dpy, HostX.win, attr.event_mask); HostX.win = XCreateWindow(HostX.dpy,
HostX.win_pre_existing,
0,0,HostX.win_width,HostX.win_height,
0,
CopyFromParent,
CopyFromParent,
CopyFromParent,
CWEventMask,
&attr);
} }
else else
{ {