fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-04-19 20:40:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Darwin: Be more precise in version information shown.

Browse source
This commit is contained in:
Jeremy Huddleston 2007-12-05 20:29:23 -08:00
parent df5c9fef3c
commit 15add97723
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hw/xquartz/Makefile.am
View file

@ -15,7 +15,7 @@ SUBDIRS = . xpr $(X11APP_SUBDIRS)
DIST_SUBDIRS = xpr bundle
libXquartz_la_SOURCES = \
$(top_srcdir)/fb/fbcmap.c \
$(top_srcdir)/fb/fbcmap_mi.c \
$(top_srcdir)/mi/miinitext.c \
X11Application.m \
X11Controller.m \

6
hw/xquartz/X11Application.m
View file

@ -55,6 +55,10 @@ WindowPtr xprGetXWindowFromAppKit(int windowNumber); // xpr/xprFrame.c
#define DEFAULTS_FILE "/usr/X11/lib/X11/xserver/Xquartz.plist"
#ifndef XSERVER_VERSION
#define XSERVER_VERSION "?"
#endif
int X11EnableKeyEquivalents = TRUE;
int quartzHasRoot = FALSE, quartzEnableRootless = TRUE;
@ -151,7 +155,7 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
tem = [infoDict objectForKey:@"CFBundleShortVersionString"];
[dict setObject:[NSString stringWithFormat:@"X11.app %@ - X.org X11R7.3", tem]
[dict setObject:[NSString stringWithFormat:@"X11.app %@ - (xorg-server %s)", tem, XSERVER_VERSION]
forKey:@"ApplicationVersion"];
[self orderFrontStandardAboutPanelWithOptions: dict];

6
hw/xquartz/darwin.c
View file

@ -135,8 +135,8 @@ const int NUMFORMATS = sizeof(formats)/sizeof(formats[0]);
#ifndef BUILD_DATE
#define BUILD_DATE ""
#endif
#ifndef XORG_RELEASE
#define XORG_RELEASE "?"
#ifndef XSERVER_VERSION
#define XSERVER_VERSION "?"
#endif
void DDXRingBell(int volume, int pitch, int duration) {
@ -148,7 +148,7 @@ DarwinPrintBanner(void)
{
// this should change depending on which specific server we are building
ErrorF("X11.app starting:\n");
ErrorF("Xquartz server based on X.org %s, built on %s\n", XORG_RELEASE, BUILD_DATE );
ErrorF("X.Org Xquartz X Server %s\nBuild Date: %s\n", XSERVER_VERSION, BUILD_DATE );
}