Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

1 files changed, 244 insertions, 0 deletions

diff --git a/xorg-server/hw/xwin/xlaunch/window/wizard.cc b/xorg-server/hw/xwin/xlaunch/window/wizard.cc
new file mode 100644
index 000000000..9d6c71193
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/window/wizard.cc
@@ -0,0 +1,244 @@
+/*

+ * Copyright (c) 2005 Alexander Gottwald

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ *

+ * Except as contained in this notice, the name(s) of the above copyright

+ * holders shall not be used in advertising or otherwise to promote the sale,

+ * use or other dealings in this Software without prior written authorization.

+ */

+#include "wizard.h"

+#include "util.h"

+

+CWizard::CWizard() : pages() 

+{

+};

+

+void CWizard::AddPage(const PROPSHEETPAGE &page)

+{

+    pages.push_back(page);

+}

+

+void CWizard::AddPage(const char *page, HINSTANCE instance)

+{

+    PROPSHEETPAGE psp;

+    if (instance == NULL)

+        instance = GetModuleHandle(NULL);

+    

+    memset(&psp, 0, sizeof(psp));

+    psp.dwSize = sizeof(PROPSHEETPAGE);

+    psp.dwFlags = PSP_DEFAULT;

+    psp.hInstance = instance;

+    psp.pszTemplate = page;

+    psp.pfnDlgProc = WizardDialogProc;

+    psp.lParam = (LPARAM)this;

+

+    AddPage(psp);

+}

+

+void CWizard::AddPage(DWORD id, DWORD title, DWORD subtitle, HINSTANCE instance)

+{

+    PROPSHEETPAGE psp;

+    if (instance == NULL)

+        instance = GetModuleHandle(NULL);

+    

+    memset(&psp, 0, sizeof(psp));

+    psp.dwSize = sizeof(PROPSHEETPAGE);

+    psp.dwFlags = PSP_DEFAULT;

+#if _WIN32_IE >= 0x0500

+    if (title != 0)

+    {

+        psp.dwFlags |= PSP_USEHEADERTITLE;

+        psp.pszHeaderTitle = MAKEINTRESOURCE(title);

+    }

+    if (subtitle != 0)

+    {

+        psp.dwFlags |= PSP_USEHEADERSUBTITLE;

+        psp.pszHeaderSubTitle = MAKEINTRESOURCE(subtitle);

+    }

+#endif

+		

+    psp.hInstance = instance;

+    psp.pszTemplate = MAKEINTRESOURCE(id);

+    psp.pfnDlgProc = WizardDialogProc;

+    psp.lParam = (LPARAM)this;

+

+    AddPage(psp);

+}

+

+HWND CWizard::CreateWindowHandle()

+{

+    PROPSHEETHEADER psh;

+    HWND ret;

+    

+    PrepareSheetHeader(psh, FALSE);

+    ret = (HWND)PropertySheet(&psh);

+    free(psh.phpage);

+    if (ret == NULL)

+        throw win32_error("PropertySheet failed");

+    return ret;

+}

+

+int CWizard::ShowModal()

+{

+    PROPSHEETHEADER psh;

+    int ret;

+    

+    PrepareSheetHeader(psh, TRUE);

+    ret = PropertySheet(&psh);

+    free(psh.phpage);

+    return ret;

+}

+

+void CWizard::PrepareSheetHeader(PROPSHEETHEADER &psh, BOOL modal)

+{

+    HPROPSHEETPAGE *phpage = (HPROPSHEETPAGE*)malloc(pages.size() * sizeof(HPROPSHEETPAGE));

+    DWORD modeflag;

+

+    if (modal)

+        modeflag = 0;

+    else

+        modeflag = PSH_MODELESS;

+    

+    for (unsigned i = 0; i < pages.size(); i++)

+    {

+        phpage[i] = CreatePropertySheetPage(&pages[i]);

+        if (phpage[i] == NULL)

+        {

+            DWORD err = GetLastError();

+            free(phpage);

+            throw win32_error("CreatePropertySheetPage failed", err);

+        }

+    }

+

+    memset(&psh, 0, sizeof(psh));

+    psh.dwSize = sizeof(PROPSHEETHEADER);

+#if _WIN32_IE >= 0x0500

+    psh.dwFlags = PSH_WIZARD97 | modeflag;

+#else

+    psh.dwFlags = PSH_WIZARD | modeflag;

+#endif

+    psh.hwndParent = NULL;

+    psh.hInstance = GetModuleHandle(NULL);

+    psh.pszIcon = NULL;

+    psh.pszCaption = (LPSTR) "Cell Properties";

+    psh.nPages = pages.size(); 

+    psh.nStartPage = 0;

+    psh.phpage = phpage;

+    psh.pfnCallback = NULL;

+}

+

+DWORD CWizard::PageID(unsigned index)

+{

+    if (index < pages.size() && IS_INTRESOURCE(pages[index].pszTemplate))

+	return (DWORD)pages[index].pszTemplate;

+    return (DWORD)-1;

+}

+

+unsigned CWizard::PageIndex(PROPSHEETPAGE *psp)

+{

+    for (unsigned i = 0; i < pages.size(); i++)

+    {

+	if (IS_INTRESOURCE(psp->pszTemplate) || IS_INTRESOURCE(pages[i].pszTemplate ))

+	{

+	    if (psp->pszTemplate == pages[i].pszTemplate)

+		return i;

+	}	    

+	else if (psp->pszTemplate && pages[i].pszTemplate)

+	{

+	    if (strcmp(psp->pszTemplate, pages[i].pszTemplate) == 0)

+		return i;

+	}

+    }

+    return (unsigned)-1;

+}

+

+INT_PTR CWizard::DlgDispatch(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)

+{

+    return CBaseDialog::DlgDispatch(hwndDlg, uMsg, wParam, lParam);

+}

+

+INT_PTR CWizard::PageDispatch(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam, PROPSHEETPAGE *psp)

+{

+    LPNMHDR pnmh = (LPNMHDR)lParam;

+    DWORD flags; 

+    unsigned pageindex;

+    switch (uMsg)

+    {

+	case WM_NOTIFY:

+	    switch (pnmh->code)

+	    {

+		case PSN_SETACTIVE:

+#ifdef _DEBUG

+                    printf("PSN_SETACTIVE %d\n", PageIndex(psp));

+#endif

+		    pageindex = PageIndex(psp);

+		    if (pageindex != (unsigned)-1)

+		    {

+			flags = 0;

+			if (pageindex > 0)

+			    flags |= PSWIZB_BACK;

+			if ((unsigned)pageindex + 1 == pages.size())

+			    flags |= PSWIZB_FINISH;

+			if ((unsigned)pageindex + 1 < pages.size())

+                            flags |= PSWIZB_NEXT;

+                        PropSheet_SetWizButtons(GetParent(hwndDlg), flags);

+		    }

+		    WizardActivate(hwndDlg, pageindex);

+		    break;

+		case PSN_WIZNEXT:

+                    if (WizardNext(hwndDlg, PageIndex(psp)))

+                        return TRUE;

+		    break;

+		case PSN_WIZBACK:

+                    if (WizardBack(hwndDlg, PageIndex(psp)))

+                        return TRUE;

+		    break;

+                case PSN_WIZFINISH:

+                    if (WizardFinish(hwndDlg, PageIndex(psp)))

+                        return TRUE;

+                    DestroyWindow(GetParent(hwndDlg));

+		case PSN_RESET:

+                    if (WizardReset(hwndDlg, PageIndex(psp)))

+                        return TRUE;

+                    DestroyWindow(GetParent(hwndDlg));

+		    break;

+	    }

+    }

+    return DlgDispatch(hwndDlg, uMsg, wParam, lParam);

+}

+

+

+INT_PTR CALLBACK CWizard::WizardDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)

+{

+    MessageDebug::debug(hwndDlg, uMsg, wParam, lParam, __FUNCTION__);

+    PROPSHEETPAGE *psp = (PROPSHEETPAGE*)lParam;

+    switch (uMsg)

+    {

+	case WM_INITDIALOG:

+	    SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)psp);

+	    break;

+    }

+    psp = (PROPSHEETPAGE*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

+    CWizard* wizard = psp?(CWizard*)psp->lParam:NULL;

+    if (wizard != NULL)

+        return wizard->PageDispatch(hwndDlg, uMsg, wParam, lParam, psp);

+    return FALSE;

+}

+