From fddd0263e71abd532f2b596c43043f221bea8417 Mon Sep 17 00:00:00 2001 From: marha Date: Sat, 20 Feb 2010 17:55:50 +0000 Subject: Added opengl option in dialog --- xorg-server/hw/xwin/xlaunch/config.h | 3 ++- xorg-server/hw/xwin/xlaunch/main.cc | 22 +++++++++++++++------- xorg-server/hw/xwin/xlaunch/resources/dialog.rc | 13 ++++++++----- xorg-server/hw/xwin/xlaunch/resources/resources.h | 8 +++++--- xorg-server/hw/xwin/xlaunch/resources/strings.rc | 14 ++++++++------ 5 files changed, 38 insertions(+), 22 deletions(-) diff --git a/xorg-server/hw/xwin/xlaunch/config.h b/xorg-server/hw/xwin/xlaunch/config.h index 8017ffb55..993c31580 100644 --- a/xorg-server/hw/xwin/xlaunch/config.h +++ b/xorg-server/hw/xwin/xlaunch/config.h @@ -60,6 +60,7 @@ struct CConfig std::string xdmcp_host; std::vector xhosts; bool clipboard; + bool wgl; bool no_access_control; std::string font_server; std::string extra_params; @@ -73,7 +74,7 @@ struct CConfig protocol_path(""), program("xeyes"), progs(PROG_NUMBER), compress(false), host(""), user("ago"), password(""), password_save(false), password_start(false), broadcast(false), indirect(false), xdmcp_host(""), xhosts(HOST_NUMBER), clipboard(true), no_access_control(false), - font_server(), extra_params(), extra_ssh() {}; + font_server(), extra_params(), extra_ssh(), wgl(true) {}; void Load(const char * filename); void Save(const char * filename); }; diff --git a/xorg-server/hw/xwin/xlaunch/main.cc b/xorg-server/hw/xwin/xlaunch/main.cc index ad84f6a10..f56c0514e 100644 --- a/xorg-server/hw/xwin/xlaunch/main.cc +++ b/xorg-server/hw/xwin/xlaunch/main.cc @@ -62,7 +62,7 @@ class CMyWizard : public CWizard AddPage(IDD_PROGRAM, IDS_PROGRAM_TITLE, IDS_PROGRAM_SUBTITLE); AddPage(IDD_XDMCP, IDS_XDMCP_TITLE, IDS_XDMCP_SUBTITLE); //AddPage(IDD_FONTPATH, IDS_FONTPATH_TITLE, IDS_FONTPATH_SUBTITLE); - AddPage(IDD_CLIPBOARD, IDS_CLIPBOARD_TITLE, IDS_CLIPBOARD_SUBTITLE); + AddPage(IDD_EXTRA, IDS_EXTRA_TITLE, IDS_EXTRA_SUBTITLE); AddPage(IDD_FINISH, IDS_FINISH_TITLE, IDS_FINISH_SUBTITLE); } @@ -133,7 +133,7 @@ class CMyWizard : public CWizard } else if (IsDlgButtonChecked(hwndDlg, IDC_CLIENT_NONE)) { config.client = CConfig::NoClient; - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CLIPBOARD); + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_EXTRA); } else SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); return TRUE; @@ -165,7 +165,7 @@ class CMyWizard : public CWizard if (!config.local && (config.host.empty() || config.program.empty())) SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); else - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CLIPBOARD); + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_EXTRA); return TRUE; case IDD_XDMCP: // Check for broadcast @@ -194,14 +194,19 @@ class CMyWizard : public CWizard if (!config.broadcast && config.xdmcp_host.empty()) SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); else - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CLIPBOARD); + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_EXTRA); return TRUE; - case IDD_CLIPBOARD: + case IDD_EXTRA: // check for clipboard if (IsDlgButtonChecked(hwndDlg, IDC_CLIPBOARD)) config.clipboard = true; else config.clipboard = false; + // check for wgl + if (IsDlgButtonChecked(hwndDlg, IDC_WGL)) + config.wgl = true; + else + config.wgl = false; // read parameters { char buffer[512]; @@ -242,7 +247,7 @@ class CMyWizard : public CWizard SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CLIENTS); return TRUE; case IDD_FONTPATH: - case IDD_CLIPBOARD: // temporary. fontpath is disabled + case IDD_EXTRA: // temporary. fontpath is disabled switch (config.client) { case CConfig::NoClient: @@ -442,8 +447,9 @@ class CMyWizard : public CWizard // Set hostname SetDlgItemText(hwndDlg, IDC_XDMCP_HOST, config.xdmcp_host.c_str()); break; - case IDD_CLIPBOARD: + case IDD_EXTRA: CheckDlgButton(hwndDlg, IDC_CLIPBOARD, config.clipboard?BST_CHECKED:BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_WGL, config.wgl?BST_CHECKED:BST_UNCHECKED); SetDlgItemText(hwndDlg, IDC_EXTRA_PARAMS, config.extra_params.c_str()); break; @@ -542,6 +548,8 @@ class CMyWizard : public CWizard } if (config.clipboard) buffer += "-clipboard "; + if (config.wgl) + buffer += "-wgl "; if (!config.extra_params.empty()) { buffer += config.extra_params; diff --git a/xorg-server/hw/xwin/xlaunch/resources/dialog.rc b/xorg-server/hw/xwin/xlaunch/resources/dialog.rc index f029c8a17..f6675e192 100644 --- a/xorg-server/hw/xwin/xlaunch/resources/dialog.rc +++ b/xorg-server/hw/xwin/xlaunch/resources/dialog.rc @@ -95,16 +95,19 @@ BEGIN LTEXT STR_XDMCP_QUERY_DESC,IDC_XDMCP_QUERY_DESC,7,56,300,42 END -IDD_CLIPBOARD DIALOGEX 0, 0, 317, 143 +IDD_EXTRA DIALOGEX 0, 0, 317, 143 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTERMOUSE -CAPTION STR_CAPTION_CLIPBOARD +CAPTION STR_CAPTION_EXTRA FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN AUTOCHECKBOX STR_CLIPBOARD,IDC_CLIPBOARD,7,14,300,10 - LTEXT STR_CLIPBOARD_DESC,IDC_CLIPBOARD_DESC,19,28,280,27 + LTEXT STR_CLIPBOARD_DESC,IDC_CLIPBOARD_DESC,19,24,280,27 - LTEXT STR_EXTRA_PARAMS_DESC,IDC_EXTRA_PARAMS_DESC,7,56,280,10 - EDITTEXT IDC_EXTRA_PARAMS,7,70,300,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + AUTOCHECKBOX STR_WGL,IDC_WGL,7,42,300,10 + LTEXT STR_WGL_DESC,IDC_WGL_DESC,19,52,280,27 + + LTEXT STR_EXTRA_PARAMS_DESC,IDC_EXTRA_PARAMS_DESC,7,84,280,10 + EDITTEXT IDC_EXTRA_PARAMS,7,98,300,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL END IDD_FINISH DIALOGEX 0, 0, 317, 143 diff --git a/xorg-server/hw/xwin/xlaunch/resources/resources.h b/xorg-server/hw/xwin/xlaunch/resources/resources.h index 15e733844..4465952c7 100644 --- a/xorg-server/hw/xwin/xlaunch/resources/resources.h +++ b/xorg-server/hw/xwin/xlaunch/resources/resources.h @@ -33,7 +33,7 @@ #define IDD_PROGRAM 104 #define IDD_XDMCP 105 #define IDD_FONTPATH 106 -#define IDD_CLIPBOARD 107 +#define IDD_EXTRA 107 #define IDI_XLAUNCH 108 @@ -49,8 +49,8 @@ #define IDS_FONTPATH_SUBTITLE 309 #define IDS_FINISH_TITLE 310 #define IDS_FINISH_SUBTITLE 311 -#define IDS_CLIPBOARD_TITLE 312 -#define IDS_CLIPBOARD_SUBTITLE 313 +#define IDS_EXTRA_TITLE 312 +#define IDS_EXTRA_SUBTITLE 313 #define IDS_SAVE_TITLE 320 #define IDS_SAVE_FILETITLE 321 #define IDS_SAVE_FILTER 322 @@ -99,3 +99,5 @@ #define IDC_CLIPBOARD_DESC 261 #define IDC_EXTRA_PARAMS 262 #define IDC_EXTRA_PARAMS_DESC 263 +#define IDC_WGL 264 +#define IDC_WGL_DESC 265 diff --git a/xorg-server/hw/xwin/xlaunch/resources/strings.rc b/xorg-server/hw/xwin/xlaunch/resources/strings.rc index 94db96659..319ea4c2f 100644 --- a/xorg-server/hw/xwin/xlaunch/resources/strings.rc +++ b/xorg-server/hw/xwin/xlaunch/resources/strings.rc @@ -57,9 +57,11 @@ #define STR_CAPTION_FONTPATH "Fontpath settings" -#define STR_CAPTION_CLIPBOARD "Clipboard settings" +#define STR_CAPTION_EXTRA "Extra settings" #define STR_CLIPBOARD "Clipboard" #define STR_CLIPBOARD_DESC "Start the integrated clipboard manager" +#define STR_WGL "Native opengl" +#define STR_WGL_DESC "Use the native windows opengl library (wgl). Make sure to export the LIBGL_ALWAYS_INDIRECT environment variable." #define STR_EXTRA_PARAMS_DESC "Additional parameters for VcXsrv" #define STR_CAPTION_FINISH "Finish configuration" @@ -79,8 +81,8 @@ #define STR_FONTPATH_SUBTITLE "" #define STR_FINISH_TITLE "Configuration complete" #define STR_FINISH_SUBTITLE "" -#define STR_CLIPBOARD_TITLE "Clipboard settings" -#define STR_CLIPBOARD_SUBTITLE "" +#define STR_EXTRA_TITLE "Extra settings" +#define STR_EXTRA_SUBTITLE "" #define STR_SAVE_TITLE "Save configuration" #define STR_SAVE_FILETITLE "Filename" @@ -100,9 +102,9 @@ BEGIN IDS_FONTPATH_SUBTITLE STR_FONTPATH_SUBTITLE IDS_FINISH_TITLE STR_FINISH_TITLE IDS_FINISH_SUBTITLE STR_FINISH_SUBTITLE - IDS_CLIPBOARD_TITLE STR_CLIPBOARD_TITLE - IDS_CLIPBOARD_SUBTITLE STR_CLIPBOARD_SUBTITLE - IDS_SAVE_TITLE STR_SAVE_TITLE + IDS_EXTRA_TITLE STR_EXTRA_TITLE + IDS_EXTRA_SUBTITLE STR_EXTRA_SUBTITLE + IDS_SAVE_TITLE STR_SAVE_TITLE IDS_SAVE_FILETITLE STR_SAVE_FILETITLE IDS_SAVE_FILTER STR_SAVE_FILTER END -- cgit v1.2.3