diff --git a/dix/dispatch.c b/dix/dispatch.c index 682f0d70de..819433eee0 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -611,7 +611,7 @@ CreateConnectionBlock(void) unsigned long vid; int paddingforint32, lenofblock, sizesofar = 0; char *pBuf; - const char VendorString[] = VENDOR_NAME; + const char VendorString[] = "XLibre"; memset(&setup, 0, sizeof(xConnSetup)); /* Leave off the ridBase and ridMask, these must be sent with diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 78d684543f..33e2c4aad0 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -185,15 +185,9 @@ xf86PrintBanner(void) #endif } } -#endif -#if defined(BUILDERSTRING) - xf86ErrorFVerb(0, "%s \n", BUILDERSTRING); #endif xf86ErrorFVerb(0, "Current version of pixman: %s\n", pixman_version_string()); - xf86ErrorFVerb(0, "\tBefore reporting problems, check " - "" __VENDORDWEBSUPPORT__ "\n" - "\tto make sure that you have the latest version.\n"); } Bool @@ -869,8 +863,7 @@ ddxGiveUp(enum ExitCode error) void OsVendorFatalError(const char *f, va_list args) { - ErrorF("\nPlease consult the " XVENDORNAME " support \n\t at " - __VENDORDWEBSUPPORT__ "\n for help. \n"); + ErrorF("\nPlease consult the XLibre support: https://www.xlibre.net/\n"); if (xf86LogFile && xf86LogFileWasOpened) ErrorF("Please also check the log file at \"%s\" for additional " "information.\n", xf86LogFile); diff --git a/hw/xfree86/xorg-config.h.meson.in b/hw/xfree86/xorg-config.h.meson.in index 1e03060837..d74301f86e 100644 --- a/hw/xfree86/xorg-config.h.meson.in +++ b/hw/xfree86/xorg-config.h.meson.in @@ -21,9 +21,6 @@ /* Name of X server. */ #mesondefine __XSERVERNAME__ -/* URL to go to for support. */ -#mesondefine __VENDORDWEBSUPPORT__ - /* Built-in output drivers. */ #mesondefine DRIVERS diff --git a/hw/xfree86/xorg-server.h.meson.in b/hw/xfree86/xorg-server.h.meson.in index 004ab14b17..5956367f07 100644 --- a/hw/xfree86/xorg-server.h.meson.in +++ b/hw/xfree86/xorg-server.h.meson.in @@ -142,9 +142,6 @@ /* Support Xv Extension */ #mesondefine XV -/* Vendor name */ -#mesondefine XVENDORNAME - /* BSD-compliant source */ #mesondefine _BSD_SOURCE @@ -154,9 +151,6 @@ /* X/Open-compliant source */ #mesondefine _XOPEN_SOURCE -/* Vendor web address for support */ -#mesondefine __VENDORDWEBSUPPORT__ - /* Location of configuration file */ #mesondefine XCONFIGFILE diff --git a/hw/xwin/XWin.rc b/hw/xwin/XWin.rc index a54e0fdbb2..7ebb11d3a9 100644 --- a/hw/xwin/XWin.rc +++ b/hw/xwin/XWin.rc @@ -41,15 +41,15 @@ /* About */ ABOUT_BOX DIALOGEX 32, 32, 260, 105 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTERMOUSE -CAPTION "About " XVENDORNAMESHORT +CAPTION "About XLibre" FONT 8, "MS Shell Dlg 2" BEGIN CONTROL IDI_XWIN, IDC_STATIC, "Static", SS_ICON, 8, 8, 32, 32 - LTEXT XVENDORNAMESHORT " X Server ", IDC_STATIC, 36, 8, 220, 8 + LTEXT " XLibre X Server ", IDC_STATIC, 36, 8, 220, 8 LTEXT VENDOR_MAN_VERSION, IDC_STATIC, 36, 18, 220, 8 - LTEXT BUILDERSTRING, IDC_STATIC, 36, 28, 220, 8 + LTEXT "", IDC_STATIC, 36, 28, 220, 8 LTEXT "This software is licensed under the terms of the MIT/X11 License.", IDC_STATIC, 36, 48, 220, 20 - CONTROL __VENDORDWEBSUPPORT__, ID_ABOUT_WEBSITE, "Button", + CONTROL "https://www.xlibre.net/", ID_ABOUT_WEBSITE, "Button", BS_OWNERDRAW | WS_TABSTOP, 36, 68, 220, 8 DEFPUSHBUTTON "&OK", IDOK, 105, 85, 50, 15 END @@ -60,12 +60,12 @@ END DEPTH_CHANGE_BOX DIALOGEX 32, 32, 180, 100 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTERMOUSE FONT 8, "MS Shell Dlg 2" -CAPTION XVENDORNAMESHORT +CAPTION "XLibre" BEGIN DEFPUSHBUTTON "Dismiss", IDOK, 66, 80, 50, 14 - CTEXT XVENDORNAMESHORT, IDC_STATIC, 40, 12, 100, 8 + CTEXT "XLibre", IDC_STATIC, 40, 12, 100, 8 CTEXT "Disruptive screen configuration change.", IDC_STATIC, 7, 40, 166, 8 - CTEXT "Restore previous resolution to use " XVENDORNAMESHORT ".", IDC_STATIC, 7, 52, 166, 8 + CTEXT "Restore previous resolution to use XLibre.", IDC_STATIC, 7, 52, 166, 8 END @@ -74,7 +74,7 @@ END EXIT_DIALOG DIALOGEX 32, 32, 180, 78 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTERMOUSE FONT 8, "MS Shell Dlg 2" -CAPTION "Exit " XVENDORNAMESHORT "?" +CAPTION "Exit XLibre ?" BEGIN PUSHBUTTON "E&xit", IDOK, 55, 56, 30, 14 DEFPUSHBUTTON "&Cancel", IDCANCEL, 95, 56, 30, 14 diff --git a/hw/xwin/windialogs.c b/hw/xwin/windialogs.c index 3414418bc2..fba90e13d2 100644 --- a/hw/xwin/windialogs.c +++ b/hw/xwin/windialogs.c @@ -596,7 +596,7 @@ winAboutDlgProc(HWND hwndDialog, UINT message, WPARAM wParam, LPARAM lParam) case ID_ABOUT_WEBSITE: { - const char *pszPath = __VENDORDWEBSUPPORT__; + const char *pszPath = "https://www.xlibre.net/"; INT_PTR iReturn; iReturn = (INT_PTR) ShellExecute(NULL, diff --git a/hw/xwin/winerror.c b/hw/xwin/winerror.c index 0198daeeda..52a6874013 100644 --- a/hw/xwin/winerror.c +++ b/hw/xwin/winerror.c @@ -109,18 +109,18 @@ winMessageBoxF(const char *pszError, UINT uType, ...) #define MESSAGEBOXF \ "%s\n" \ - "Vendor: %s\n" \ + "Vendor: XLibre\n" \ "Release: %d.%d.%d.%d\n" \ - "Contact: %s\n" \ - "%s\n\n" \ + "Contact: https://www.xlibre.net/\n" \ + "\n\n" \ "XWin was started with the following command-line:\n\n" \ "%s\n" size = asprintf(&pszMsgBox, MESSAGEBOXF, - pszErrorF, XVENDORNAME, + pszErrorF, XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP, - BUILDERADDR, BUILDERSTRING, g_pszCommandLine); + g_pszCommandLine); if (size == -1) { pszMsgBox = NULL; diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c index 35f3ed7745..a6bb96d45d 100644 --- a/hw/xwin/winmultiwindowwm.c +++ b/hw/xwin/winmultiwindowwm.c @@ -1861,11 +1861,11 @@ winApplyHints(WMInfoPtr pWMInfo, xcb_window_t iWindow, HWND hWnd, HWND * zstyle) #define APPLICATION_ID_FORMAT "%s.xwin.%s" #define APPLICATION_ID_UNKNOWN "unknown" if (res_class) { - asprintf(&application_id, APPLICATION_ID_FORMAT, XVENDORNAME, + asprintf(&application_id, APPLICATION_ID_FORMAT, "XLibre", res_class); } else { - asprintf(&application_id, APPLICATION_ID_FORMAT, XVENDORNAME, + asprintf(&application_id, APPLICATION_ID_FORMAT, "XLibre", APPLICATION_ID_UNKNOWN); } winSetAppUserModelID(hWnd, application_id); diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c index 56280c232a..b97d15c431 100644 --- a/hw/xwin/winprocarg.c +++ b/hw/xwin/winprocarg.c @@ -1167,8 +1167,7 @@ winLogVersionInfo(void) return; s_fBeenHere = TRUE; - ErrorF("Welcome to the XWin X Server\n"); - ErrorF("Vendor: %s\n", XVENDORNAME); + ErrorF("Welcome to the XLibre XWin X Server\n"); ErrorF("Release: %d.%d.%d.%d\n", XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP); #ifdef HAVE_SYS_UTSNAME_H @@ -1182,8 +1181,5 @@ winLogVersionInfo(void) } #endif winOS(); - if (strlen(BUILDERSTRING)) - ErrorF("%s\n", BUILDERSTRING); - ErrorF("Contact: %s\n", BUILDERADDR); ErrorF("\n"); } diff --git a/include/meson.build b/include/meson.build index 6f1bb5fcc1..19a6441ed3 100644 --- a/include/meson.build +++ b/include/meson.build @@ -273,12 +273,6 @@ conf_data.set('HAVE_ACPI', build_acpi ? '1' : false) enable_debugging = get_option('buildtype') == 'debug' conf_data.set('DEBUG', enable_debugging ? '1' : false) -conf_data.set_quoted('XVENDORNAME', get_option('vendor_name')) -conf_data.set_quoted('XVENDORNAMESHORT', get_option('vendor_name_short')) -conf_data.set_quoted('__VENDORDWEBSUPPORT__', get_option('vendor_web')) -conf_data.set_quoted('BUILDERADDR', get_option('builder_addr')) -conf_data.set_quoted('BUILDERSTRING', get_option('builder_string')) - if build_rootless conf_data.set('ROOTLESS', build_rootless ? '1' : false) conf_data.set('ROOTLESS_WORKAROUND', 1) @@ -342,9 +336,6 @@ conf_data.set('XSERVER_SCREEN_VRR', '1') version_data = configuration_data() version_data.set('VENDOR_RELEASE', '@0@'.format(release)) -version_data.set_quoted('VENDOR_NAME', get_option('vendor_name')) -version_data.set_quoted('VENDOR_NAME_SHORT', get_option('vendor_name_short')) -version_data.set_quoted('VENDOR_WEB', get_option('vendor_web')) version_data.set_quoted('VENDOR_MAN_VERSION', 'Version @0@.@1@.@2@'.format(major, minor, patch)) configure_file(output : 'version-config.h', configuration : version_data) diff --git a/meson_options.txt b/meson_options.txt index 976ba8dd84..36511fc80e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -24,10 +24,6 @@ option('kdrive_evdev', type: 'boolean', value: true, option('kdrive_tslib', type: 'boolean', value: false, description: 'Build kdrive tslib touchscreen support') - -option('builder_addr', type: 'string', description: 'Builder address', value: 'xlibre@freelists.org') -option('builder_string', type: 'string', description: 'Additional builder string') - option('log_dir', type: 'string') option('module_dir', type: 'string', value: 'xorg/modules', description: 'X.Org modules directory (absolute or relative to the directory specified by the libdir option)') @@ -57,10 +53,6 @@ option('xkb_default_options', type: 'string') option('fallback_input_driver', type: 'string', value: 'auto') -option('vendor_name', type: 'string', value: 'XLibre') -option('vendor_name_short', type: 'string', value: 'XLibre') -option('vendor_web', type: 'string', value: 'https://github.com/X11Libre/xserver') - option('dtrace', type: 'boolean', value: false, description: 'Enable dtrace hooks')