diff options
| author | marha <marha@users.sourceforge.net> | 2009-11-06 16:24:47 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-11-06 16:24:47 +0000 |
| commit | 21ce31868b5716bb6824fa47ed151fad8d8b5502 (patch) | |
| tree | 3fb0add2af39f4504775b63dfbca9c8c0d55703f /xorg-server | |
| parent | aadbba08d10065b0104b83084245f41a3e704c41 (diff) | |
| parent | 0032f9b66d63a4b1c5222edb8603fb60da379fb0 (diff) | |
| download | vcxsrv-21ce31868b5716bb6824fa47ed151fad8d8b5502.tar.gz vcxsrv-21ce31868b5716bb6824fa47ed151fad8d8b5502.tar.bz2 vcxsrv-21ce31868b5716bb6824fa47ed151fad8d8b5502.zip | |
Added xwininfo
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/hw/xwin/winprefs.c | 4 | ||||
| -rw-r--r-- | xorg-server/installer/vcxsrv.nsi | 1 | ||||
| -rw-r--r-- | xorg-server/makefile | 5 | ||||
| -rw-r--r-- | xorg-server/system.XWinrc | 1 |
4 files changed, 8 insertions, 3 deletions
diff --git a/xorg-server/hw/xwin/winprefs.c b/xorg-server/hw/xwin/winprefs.c index 60c96aff7..7059ffd6d 100644 --- a/xorg-server/hw/xwin/winprefs.c +++ b/xorg-server/hw/xwin/winprefs.c @@ -387,8 +387,8 @@ HandleCustomWM_COMMAND (unsigned long hwndIn, memset (&start, 0, sizeof (start)); start.cb = sizeof (start); - start.dwFlags = STARTF_USESHOWWINDOW; - start.wShowWindow = SW_HIDE; + //start.dwFlags = STARTF_USESHOWWINDOW; + //start.wShowWindow = SW_HIDE; memset (&child, 0, sizeof (child)); diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index ef35e49f9..7f746b259 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -66,6 +66,7 @@ Section "VcXsrv (required)" File "..\xcalc"
File "..\xcalc-color"
File "..\..\apps\xclock\obj\release\xclock.exe"
+ File "..\..\apps\xwininfo\obj\release\xwininfo.exe"
File "..\XKeysymDB"
File "..\XErrorDB"
File "..\hw\xwin\xlaunch\obj\release\xlaunch.exe"
diff --git a/xorg-server/makefile b/xorg-server/makefile index 968c40915..814b3e915 100644 --- a/xorg-server/makefile +++ b/xorg-server/makefile @@ -113,6 +113,9 @@ xcalc.exe: ..\apps\xcalc\obj\release\xcalc.exe XCalc XCalc-color xclock.exe: ..\apps\xclock\obj\release\xclock.exe copy $< $@ +xwininfo.exe: ..\apps\xwininfo\obj\release\xwininfo.exe + copy $< $@ + load_makefile ..\tools\plink\makefile MAKESERVER=0 DEBUG=0 plink.exe: ..\tools\plink\obj\release\plink.exe @@ -124,7 +127,7 @@ load_makefile xkbdata.src\makefile MAKESERVER=0 DEBUG=0 all: $(APP).exe xlaunch.exe xkbcomp.exe protocol.txt XKeysymDB XErrorDB \ ..\libX11\nls\all fonts.src\all xkbdata.src\all plink.exe xclock.exe xcalc.exe \ - opengl32.dll swrast_dri.dll + xwininfo.exe opengl32.dll swrast_dri.dll swrast_dri.dll: ..\mesalib\lib\swrast_dri.dll copy $< $@ diff --git a/xorg-server/system.XWinrc b/xorg-server/system.XWinrc index 94aabfd79..15935f4e5 100644 --- a/xorg-server/system.XWinrc +++ b/xorg-server/system.XWinrc @@ -81,6 +81,7 @@ menu apps { xcalc exec "xcalc" xclock exec "xclock" + xwininfo exec "xwininfo -pause" } menu root { |