lkn
/
windowmaker-wl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wings: revert accidental WNativeWindow rename in strings/comments 

The phase-β sed pass renamed every C 'Window' identifier to
WNativeWindow.  That correctly updated typedef uses but also rewrote
the string 'Window Maker', UI labels like 'Window Manager', 'Window
Placement', 'Window Title', 'Window List', 'Window System session',
etc., plus a number of comments referring to 'Window' as English.

Fixed all of those.  The C type uses (WNativeWindow rootWin, etc.)
remain unchanged — only English-language occurrences are reverted.
Verified that wmaker now reports 'Window Maker 0.96.0' again and
build is clean across WINGs/, src/, WPrefs.app/.
This commit is contained in:
Window Maker 2026-05-24 11:42:37 +02:00
parent 5417d3cbbd
commit fb817a7b27
127 changed files with 237 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WINGs/Tests/wtest.c
View File

@ -570,8 +570,8 @@ void testText(WMScreen * scr)
#define FNAME "Verdana,sans serif:pixelsize=12"
#define MSG \
"WNativeWindow Maker is the GNU window manager for the " \
"X WNativeWindow System. It was designed to emulate the " \
"Window Maker is the GNU window manager for the " \
"X Window System. It was designed to emulate the " \
"look and feel of part of the NEXTSTEP(tm) GUI. It's " \
"supposed to be relatively fast and small, feature " \
"rich, easy to configure and easy to use, with a simple " \

2
WINGs/WINGs/WINGsP.h.in
View File

@ -282,7 +282,7 @@ typedef struct W_Screen {
unsigned ignoreNextDoubleClick:1;
/*
* New stuff in WNativeWindow Maker 0.95.7
* New stuff in Window Maker 0.95.7
* Added at the end of the structure to avoid breaking binary compatibility
* with previous versions of the toolkit
*/

2
WINGs/error.c
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker miscelaneous function library
* Window Maker miscelaneous function library
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

2
WINGs/error.h
View File

@ -1,6 +1,6 @@
/* WUtil / error.h
*
* Copyright (c) 2014 WNativeWindow Maker Team
* Copyright (c) 2014 Window Maker Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
WINGs/findfile.c
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker miscelaneous function library
* Window Maker miscelaneous function library
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

2
WINGs/memory.c
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker miscelaneous function library
* Window Maker miscelaneous function library
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

2
WINGs/menuparser.c
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 2012 Christophe Curis
*

2
WINGs/menuparser_macros.c
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 2012 Christophe Curis
*

2
WINGs/misc.c
View File

@ -1,7 +1,7 @@
/* WUtil / misc.c
*
* Copyright (c) 2001 Dan Pascu
* Copyright (c) 2014 WNativeWindow Maker Team
* Copyright (c) 2014 Window Maker Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
WINGs/userdefaults.h
View File

@ -1,6 +1,6 @@
/* WUtil / userdefaults.h
*
* Copyright (c) 2014 WNativeWindow Maker Team
* Copyright (c) 2014 Window Maker Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
WINGs/wcolorpanel_x11.c
View File

@ -1362,7 +1362,7 @@ static void modeButtonCallback(WMWidget * w, void *data)
WMSetColorPanelPickerMode(panel, WMHSBModeColorPanel);
}
/****************** Magnifying WMNativeCursor Functions *******************/
/****************** Magnifying Cursor Functions *******************/
static XImage *magnifyGetImage(WMScreen * scr, XImage * image, int x, int y, int w, int h)
{

16
WPrefs.app/Appearance.c
View File

@ -1,6 +1,6 @@
/* Apperance.c- color/texture for titlebar etc.
*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 1999-2003 Alfredo K. Kojima
*
@ -41,11 +41,11 @@ static const struct {
WMPoint hand; /* The coordinate where the hand is drawn when pointing this item */
} colorOptions[] = {
/* Related to WNativeWindow titles */
{ "FTitleColor", "white", N_("Focused WNativeWindow Title"),
{ "FTitleColor", "white", N_("Focused Window Title"),
{ { 30, 10 }, { 190, 20 } }, { 5, 10 } },
{ "UTitleColor", "black", N_("Unfocused WNativeWindow Title"),
{ "UTitleColor", "black", N_("Unfocused Window Title"),
{ { 30, 40 }, { 190, 20 } }, { 5, 40 } },
{ "PTitleColor", "white", N_("Owner of Focused WNativeWindow Title"),
{ "PTitleColor", "white", N_("Owner of Focused Window Title"),
{ { 30, 70 }, { 190, 20 } }, { 5, 70 } },
/* Related to Menus */
@ -68,11 +68,11 @@ static const struct {
*/
/* Related to WNativeWindow's border */
{ "FrameFocusedBorderColor", "black", N_("Focused WNativeWindow Border Color") ,
{ "FrameFocusedBorderColor", "black", N_("Focused Window Border Color") ,
{ { 0, 0 }, { 0, 0 } }, { -22, -21 } },
{ "FrameBorderColor", "black", N_("WNativeWindow Border Color") ,
{ "FrameBorderColor", "black", N_("Window Border Color") ,
{ { 0, 0 }, { 0, 0 } }, { -22, -21 } },
{ "FrameSelectedBorderColor", "white", N_("Selected WNativeWindow Border Color") ,
{ "FrameSelectedBorderColor", "white", N_("Selected Window Border Color") ,
{ { 0, 0 }, { 0, 0 } }, { -22, -21 } },
/* Related to Icons and Clip */
@ -392,7 +392,7 @@ static const struct {
#define PRESIZEBAR 3
{ "ResizebarBack", "(solid, gray)", N_("[Resizebar]"),
{ { 30, 100 }, { 190, 9 } }, { 5, 100 }, N_("WNativeWindow Resizebar") },
{ { 30, 100 }, { 190, 9 } }, { 5, 100 }, N_("Window Resizebar") },
#define PMTITLE 4
{ "MenuTitleBack", "(solid, black)", N_("[Menu Title]"),

6
WPrefs.app/Configurations.c
View File

@ -1,6 +1,6 @@
/* Configurations.c- misc. configurations
*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 1998-2003 Alfredo K. Kojima
*
@ -347,7 +347,7 @@ static void createPanel(Panel *p)
WMMoveWidget(panel->dithF, 237, 120);
WMSetFrameTitle(panel->dithF, _("Dithering colormap for 8bpp"));
WMSetBalloonTextForView(_("Number of colors to reserve for WNativeWindow Maker\n"
WMSetBalloonTextForView(_("Number of colors to reserve for Window Maker\n"
"on displays that support only 8bpp (PseudoColor)."),
WMWidgetView(panel->dithF));
@ -433,7 +433,7 @@ Panel *InitConfigurations(WMWidget *parent)
panel->sectionName = _("Other Configurations");
panel->description = _("Animation speeds, titlebar styles, various option\n"
"toggling and number of colors to reserve for\n" "WNativeWindow Maker on 8bit displays.");
"toggling and number of colors to reserve for\n" "Window Maker on 8bit displays.");
panel->parent = parent;
panel->callbacks.createWidgets = createPanel;

2
WPrefs.app/Docks.c
View File

@ -1,6 +1,6 @@
/* Workspace.c- workspace options
*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 2012 Daniel Déchelotte (heavily inspired from file (c) Alfredo K. Kojima)
*

8
WPrefs.app/Expert.c
View File

@ -1,10 +1,10 @@
/* Expert.c- expert user options
*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 2014-2023 WNativeWindow Maker Team
* Copyright (c) 2014-2023 Window Maker Team
* Copyright (c) 1998-2003 Alfredo K. Kojima
* Copyright (c) 2009-2023 WNativeWindow Maker Team
* Copyright (c) 2009-2023 Window Maker Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -54,7 +54,7 @@ static struct expert_option {
{ N_("Do not set non-WindowMaker specific parameters (do not use xset)."),
/* default: */ False, OPTION_USERDEF, "NoXSetStuff" },
{ N_("Automatically save session when exiting WNativeWindow Maker."),
{ N_("Automatically save session when exiting Window Maker."),
/* default: */ False, OPTION_WMAKER, "SaveSessionOnExit" },
{ N_("Use SaveUnder in window frames, icons, menus and other objects."),

6
WPrefs.app/Focus.c
View File

@ -1,6 +1,6 @@
/* Focus.c- input and colormap focus stuff
*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 1998-2003 Alfredo K. Kojima
*
@ -251,7 +251,7 @@ static void createPanel(Panel * p)
panel->raisF = WMCreateFrame(panel->box);
WMResizeWidget(panel->raisF, 245, 68);
WMMoveWidget(panel->raisF, 265, 10);
WMSetFrameTitle(panel->raisF, _("Automatic WNativeWindow Raise Delay"));
WMSetFrameTitle(panel->raisF, _("Automatic Window Raise Delay"));
buf1 = wmalloc(strlen(DELAY_ICON) + 1);
buf2 = wmalloc(strlen(DELAY_ICON_S) + 1);
@ -349,7 +349,7 @@ Panel *InitFocus(WMWidget *parent)
panel = wmalloc(sizeof(_Panel));
panel->sectionName = _("WNativeWindow Focus Preferences");
panel->sectionName = _("Window Focus Preferences");
panel->description = _("Keyboard focus switching policy and related options.");
panel->parent = parent;

6
WPrefs.app/FontSimple.c
View File

@ -1,6 +1,6 @@
/* FontSimple.c- simplified font configuration panel
*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 1998-2004 Alfredo K. Kojima
*
@ -96,7 +96,7 @@ static const struct {
const char *option;
const char *label;
} fontOptions[] = {
{ "WindowTitleFont", N_("WNativeWindow Title") },
{ "WindowTitleFont", N_("Window Title") },
{ "MenuTitleFont", N_("Menu Title") },
{ "MenuTextFont", N_("Menu Text") },
{ "IconTitleFont", N_("Icon Title") },
@ -738,7 +738,7 @@ Panel *InitFontSimple(WMWidget *parent)
panel->sectionName = _("Font Configuration");
panel->description = _("Configure fonts for WNativeWindow Maker titlebars, menus etc.");
panel->description = _("Configure fonts for Window Maker titlebars, menus etc.");
panel->parent = parent;

4
WPrefs.app/HotCornerShortcuts.c
View File

@ -1,8 +1,8 @@
/* HotCornerShortcuts.c - screen corners actions
*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 2023 WNativeWindow Maker Team
* Copyright (c) 2023 Window Maker Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
WPrefs.app/Icons.c
View File

@ -1,6 +1,6 @@
/* Icons.c- icon preferences
*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 1998-2003 Alfredo K. Kojima
*

2
WPrefs.app/KeyboardSettings.c
View File

@ -1,6 +1,6 @@
/* KeyboardSettings.c- keyboard options (equivalent to xset)
*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 1998-2003 Alfredo K. Kojima
*

6
WPrefs.app/KeyboardShortcuts.c
View File

@ -1,6 +1,6 @@
/* KeyboardShortcuts.c- keyboard shortcut bindings
*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 1998-2003 Alfredo K. Kojima
*
@ -138,7 +138,7 @@ static struct keyOption {
{ "MoveToWorkspace9Key", N_("Move window to workspace 9") },
{ "MoveToWorkspace10Key", N_("Move window to workspace 10") },
/* WNativeWindow Selection */
/* Window Selection */
{ "WindowShortcut1Key", N_("Shortcut for window 1") },
{ "WindowShortcut2Key", N_("Shortcut for window 2") },
{ "WindowShortcut3Key", N_("Shortcut for window 3") },
@ -158,7 +158,7 @@ static struct keyOption {
{ "WindowRelaunchKey", N_("Launch new instance of application") },
{ "ScreenSwitchKey", N_("Switch to next screen/monitor") },
{ "RunKey", N_("Run application") },
{ "ExitKey", N_("Exit WNativeWindow Maker") },
{ "ExitKey", N_("Exit Window Maker") },
{ "DockRaiseLowerKey", N_("Raise/Lower Dock") },
{ "ClipRaiseLowerKey", N_("Raise/Lower Clip") },
{ "ScreenCaptureKey", N_("Capture the entire screen") },

16
WPrefs.app/Menu.c
View File

@ -1,6 +1,6 @@
/* Menu.c- menu definition
*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 2000-2003 Alfredo K. Kojima
*
@ -434,7 +434,7 @@ static void createPanel(_Panel * p)
putNewItem(panel, pad, PLPipeInfo, _("Generated PL Menu"));
putNewItem(panel, pad, DirectoryInfo, _("Directory Contents"));
putNewItem(panel, pad, WSMenuInfo, _("Workspace Menu"));
putNewItem(panel, pad, WWindowListInfo, _("WNativeWindow List Menu"));
putNewItem(panel, pad, WWindowListInfo, _("Window List Menu"));
panel->itemPad[0] = pad;
}
@ -486,7 +486,7 @@ static void createPanel(_Panel * p)
data = putNewItem(panel, pad, ExecInfo, _("ghostview"));
data->param.exec.command = "gv";
data = putNewItem(panel, pad, CommandInfo, _("Exit WNativeWindow Maker"));
data = putNewItem(panel, pad, CommandInfo, _("Exit Window Maker"));
data->param.command.command = 3;
WMMapWidget(pad);
@ -764,10 +764,10 @@ static void createPanel(_Panel * p)
WMInsertListItem(panel->icommandL, 1, _("Hide All Windows Except For The Focused One"));
WMInsertListItem(panel->icommandL, 2, _("Show All Windows"));
WMInsertListItem(panel->icommandL, 3, _("Exit WNativeWindow Maker"));
WMInsertListItem(panel->icommandL, 3, _("Exit Window Maker"));
WMInsertListItem(panel->icommandL, 4, _("Exit X Session"));
WMInsertListItem(panel->icommandL, 5, _("Restart WNativeWindow Maker"));
WMInsertListItem(panel->icommandL, 6, _("Start Another WNativeWindow Manager : ("));
WMInsertListItem(panel->icommandL, 5, _("Restart Window Maker"));
WMInsertListItem(panel->icommandL, 6, _("Start Another Window Manager : ("));
WMInsertListItem(panel->icommandL, 7, _("Save Current Session"));
WMInsertListItem(panel->icommandL, 8, _("Clear Saved Session"));
@ -778,7 +778,7 @@ static void createPanel(_Panel * p)
panel->paramF = WMCreateFrame(panel->optionsF);
WMResizeWidget(panel->paramF, width, 50);
WMMoveWidget(panel->paramF, 10, 105);
WMSetFrameTitle(panel->paramF, _("WNativeWindow Manager to Start"));
WMSetFrameTitle(panel->paramF, _("Window Manager to Start"));
panel->paramT = WMCreateTextField(panel->paramF);
WMResizeWidget(panel->paramT, width - 20, 20);
@ -1100,7 +1100,7 @@ static void updateFrameTitle(_Panel * panel, const char *title, InfoType type)
break;
case WWindowListInfo:
tmp = wstrconcat(title, _(": Open WNativeWindow List Submenu"));
tmp = wstrconcat(title, _(": Open Window List Submenu"));
break;
default:

2
WPrefs.app/MenuPreferences.c
View File

@ -1,6 +1,6 @@
/* MenuPreferences.c- menu related preferences
*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 1998-2003 Alfredo K. Kojima
*

4
WPrefs.app/MouseSettings.c
View File

@ -1,7 +1,7 @@
/* MouseSettings.c- mouse options (some are equivalent to xset)
*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 1998-2003 Alfredo K. Kojima
*
@ -55,7 +55,7 @@ static const struct {
} button_actions[] = {
{ "None", N_("None") },
{ "OpenApplicationsMenu", N_("Applications Menu") },
{ "OpenWindowListMenu", N_("WNativeWindow List Menu") },
{ "OpenWindowListMenu", N_("Window List Menu") },
{ "SelectWindows", N_("Select Windows") },
{ "MoveToPrevWorkspace", N_("Previous Workspace") },
{ "MoveToNextWorkspace", N_("Next Workspace") },

2
WPrefs.app/Paths.c
View File

@ -1,6 +1,6 @@
/* Paths.c- pixmap/icon paths
*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 1998-2003 Alfredo K. Kojima
*

2
WPrefs.app/Preferences.c
View File

@ -1,6 +1,6 @@
/* Preferences.c- misc ergonomic preferences
*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 1998-2003 Alfredo K. Kojima
*

2
WPrefs.app/Themes.c
View File

@ -1,6 +1,6 @@
/* Themes.c- Theme stuff
*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 1998-2003 Alfredo K. Kojima
*

28
WPrefs.app/WPrefs.c
View File

@ -1,6 +1,6 @@
/* WPrefs.c- main window and other basic stuff
*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 1998-2003 Alfredo K. Kojima
*
@ -209,7 +209,7 @@ static void createMainWindow(WMScreen * scr)
WPrefs.win = WMCreateWindow(scr, "wprefs");
WMResizeWidget(WPrefs.win, 520, 390);
WMSetWindowTitle(WPrefs.win, _("WNativeWindow Maker Preferences"));
WMSetWindowTitle(WPrefs.win, _("Window Maker Preferences"));
WMSetWindowCloseAction(WPrefs.win, quit, NULL);
WMSetWindowMaxSize(WPrefs.win, 520, 390);
WMSetWindowMinSize(WPrefs.win, 520, 390);
@ -279,7 +279,7 @@ static void createMainWindow(WMScreen * scr)
WMResizeWidget(WPrefs.nameL, FRAME_WIDTH - 20, 60);
WMMoveWidget(WPrefs.nameL, 10, 50);
WMSetLabelFont(WPrefs.nameL, font);
WMSetLabelText(WPrefs.nameL, _("WNativeWindow Maker Preferences"));
WMSetLabelText(WPrefs.nameL, _("Window Maker Preferences"));
WMReleaseFont(font);
WPrefs.versionL = WMCreateLabel(WPrefs.banner);
@ -551,7 +551,7 @@ void Initialize(WMScreen * scr)
WMMapWidget(WPrefs.win);
XFlush(WMScreenDisplay(scr));
WMSetLabelText(WPrefs.statusL, _("Loading WNativeWindow Maker configuration files..."));
WMSetLabelText(WPrefs.statusL, _("Loading Window Maker configuration files..."));
XFlush(WMScreenDisplay(scr));
loadConfigurations(scr, WPrefs.win);
@ -614,11 +614,11 @@ static void loadConfigurations(WMScreen * scr, WMWindow * mainw)
if (!WMIsPLDictionary(db)) {
WMReleasePropList(db);
db = NULL;
sprintf(mbuf, _("WNativeWindow Maker domain (%s) is corrupted!"), path);
sprintf(mbuf, _("Window Maker domain (%s) is corrupted!"), path);
WMRunAlertPanel(scr, mainw, _("Error"), mbuf, _("OK"), NULL, NULL);
}
} else {
sprintf(mbuf, _("Could not load WNativeWindow Maker domain (%s) from defaults database."), path);
sprintf(mbuf, _("Could not load Window Maker domain (%s) from defaults database."), path);
WMRunAlertPanel(scr, mainw, _("Error"), mbuf, _("OK"), NULL, NULL);
}
@ -633,29 +633,29 @@ static void loadConfigurations(WMScreen * scr, WMWindow * mainw)
wfree(command);
}
if (!file || !fgets(buffer, 1023, file)) {
werror(_("could not extract version information from WNativeWindow Maker"));
werror(_("could not extract version information from Window Maker"));
wfatal(_("Make sure wmaker is in your search path."));
WMRunAlertPanel(scr, mainw, _("Error"),
_
("Could not extract version from WNativeWindow Maker. Make sure it is correctly installed and is in your PATH environment variable."),
("Could not extract version from Window Maker. Make sure it is correctly installed and is in your PATH environment variable."),
_("OK"), NULL, NULL);
exit(1);
}
if (file)
pclose(file);
if (sscanf(buffer, "WNativeWindow Maker %i.%i.%i", &v1, &v2, &v3) != 3
if (sscanf(buffer, "Window Maker %i.%i.%i", &v1, &v2, &v3) != 3
&& sscanf(buffer, "WindowMaker %i.%i.%i", &v1, &v2, &v3) != 3) {
WMRunAlertPanel(scr, mainw, _("Error"),
_("Could not extract version from WNativeWindow Maker. "
_("Could not extract version from Window Maker. "
"Make sure it is correctly installed and the path "
"where it installed is in the PATH environment "
"variable."), _("OK"), NULL, NULL);
exit(1);
}
if (v1 == 0 && (v2 < 18 || v3 < 0)) {
sprintf(mbuf, _("WPrefs only supports WNativeWindow Maker 0.18.0 or newer.\n"
sprintf(mbuf, _("WPrefs only supports Window Maker 0.18.0 or newer.\n"
"The version installed is %i.%i.%i\n"), v1, v2, v3);
WMRunAlertPanel(scr, mainw, _("Error"), mbuf, _("OK"), NULL, NULL);
exit(1);
@ -664,7 +664,7 @@ static void loadConfigurations(WMScreen * scr, WMWindow * mainw)
if (v1 > 1 || (v1 == 1 && (v2 > 0))) {
sprintf(mbuf,
_
("WNativeWindow Maker %i.%i.%i, which is installed in your system, is not fully supported by this version of WPrefs."),
("Window Maker %i.%i.%i, which is installed in your system, is not fully supported by this version of WPrefs."),
v1, v2, v3);
WMRunAlertPanel(scr, mainw, _("Warning"), mbuf, _("OK"), NULL, NULL);
}
@ -696,11 +696,11 @@ static void loadConfigurations(WMScreen * scr, WMWindow * mainw)
if (!WMIsPLDictionary(gdb)) {
WMReleasePropList(gdb);
gdb = NULL;
sprintf(mbuf, _("WNativeWindow Maker domain (%s) is corrupted!"), buffer);
sprintf(mbuf, _("Window Maker domain (%s) is corrupted!"), buffer);
WMRunAlertPanel(scr, mainw, _("Error"), mbuf, _("OK"), NULL, NULL);
}
} else {
sprintf(mbuf, _("Could not load global WNativeWindow Maker domain (%s)."), buffer);
sprintf(mbuf, _("Could not load global Window Maker domain (%s)."), buffer);
WMRunAlertPanel(scr, mainw, _("Error"), mbuf, _("OK"), NULL, NULL);
}

2
WPrefs.app/WPrefs.h
View File

@ -1,6 +1,6 @@
/* WPrefs.h- general definitions
*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 1998-2003 Alfredo K. Kojima
*

8
WPrefs.app/WindowHandling.c
View File

@ -1,6 +1,6 @@
/* WindowHandling.c- options for handling windows
*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 1998-2003 Alfredo K. Kojima
*
@ -303,11 +303,11 @@ static void createPanel(Panel * p)
WMSetBoxHorizontal(hbox, True);
WMAddBoxSubview(panel->box, WMWidgetView(hbox), False, True, 110, 0, 10);
/************** WNativeWindow Placement ***************/
/************** Window Placement ***************/
panel->placF = WMCreateFrame(panel->box);
WMResizeWidget(panel->placF, 222, 163);
WMMoveWidget(panel->placF, 8, 6);
WMSetFrameTitle(panel->placF, _("WNativeWindow Placement"));
WMSetFrameTitle(panel->placF, _("Window Placement"));
WMSetBalloonTextForView(_("How to place windows when they are first put\n"
"on screen."), WMWidgetView(panel->placF));
@ -595,7 +595,7 @@ Panel *InitWindowHandling(WMWidget *parent)
panel = wmalloc(sizeof(_Panel));
panel->sectionName = _("WNativeWindow Handling Preferences");
panel->sectionName = _("Window Handling Preferences");
panel->description = _("WNativeWindow handling options. Initial placement style\n"
"edge resistance, opaque move etc.");

2
WPrefs.app/Workspace.c
View File

@ -1,6 +1,6 @@
/* Workspace.c- workspace options
*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 1998-2003 Alfredo K. Kojima
*

2
WPrefs.app/editmenu.c
View File

@ -1,6 +1,6 @@
/* editmenu.c - editable menus
*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 2000-2003 Alfredo K. Kojima
*

2
WPrefs.app/editmenu.h
View File

@ -1,6 +1,6 @@
/* editmenu.h - editable menus
*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 2000-2003 Alfredo K. Kojima
*

4
WPrefs.app/main.c
View File

@ -1,5 +1,5 @@
/*
* WPrefs - WNativeWindow Maker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 1998-2003 Alfredo K. Kojima
*
@ -109,7 +109,7 @@ int main(int argc, char **argv)
if (argc > 1) {
for (i = 1; i < argc; i++) {
if (strcmp(argv[i], "-version") == 0 || strcmp(argv[i], "--version") == 0) {
printf("WPrefs (WNativeWindow Maker) %s\n", VERSION);
printf("WPrefs (Window Maker) %s\n", VERSION);
exit(0);
} else if (strcmp(argv[i], "-display") == 0) {
i++;

2
src/GNUstep.h
View File

@ -1,6 +1,6 @@
/* GNUstep.h-- stuff for compatibility with GNUstep applications
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

6
src/WindowMaker.h
View File

@ -1,8 +1,8 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 2014-2023 WNativeWindow Maker Team
* Copyright (c) 2014-2023 Window Maker Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -275,7 +275,7 @@ typedef enum {
}
/* Flags for the WNativeWindow Maker state when restarting/crash situations */
/* Flags for the Window Maker state when restarting/crash situations */
#define WFLAGS_NONE (0)
#define WFLAGS_CRASHED (1<<0)

4
src/actions.c
View File

@ -1,10 +1,10 @@
/* action.c- misc. window commands (miniaturize, hide etc.)
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu
* Copyright (c) 2014-2023 WNativeWindow Maker Team
* Copyright (c) 2014-2023 Window Maker Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
src/actions.h
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

2
src/appicon.c
View File

@ -1,6 +1,6 @@
/* appicon.c- icon for applications (not mini-window)
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu

2
src/appicon.h
View File

@ -1,6 +1,6 @@
/* appicon.h- application icon
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

2
src/application.c
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu

2
src/application.h
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

2
src/appmenu.c
View File

@ -1,6 +1,6 @@
/* appmenu.c- application defined menu
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

2
src/appmenu.h
View File

@ -1,6 +1,6 @@
/* appmenu.h- application defined menu
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

18
src/backend/wayland/wl_backend.c
View File

@ -1,5 +1,5 @@
/*
* wl_backend.c -- wlroots-based Wayland compositor backend for WNativeWindow Maker
* wl_backend.c -- wlroots-based Wayland compositor backend for Window Maker
*
* Phase 31: complete stub vtable. Every slot compiles and returns a safe
* zero/null/false value. Subsequent phases will replace stubs with real
@ -14,7 +14,7 @@
* Phase 37: frame callbacks driven by output frame event; XDG configure
* sent on new toplevel so clients complete their first frame.
* Phase 38: per-toplevel view struct with map/unmap/destroy lifecycle;
* synthetic WNativeWindow IDs; context_save/find/delete implemented.
* synthetic Window IDs; context_save/find/delete implemented.
* Phase 39: handle_toplevel_map wires XDG toplevel map to wManageWindow so
* Wayland surfaces appear in scr->focused_window list.
* Phase 40: handle_toplevel_unmap wires XDG toplevel unmap to wUnmanageWindow.
@ -55,14 +55,14 @@
* listener responds immediately with CLIENT_SIDE mode so clients draw their
* own title bars (no X11 frame rendering in the Wayland path).
* Phase 65: prop_get_transient_for implemented — walks xdg_toplevel->parent
* chain and returns the synthetic WNativeWindow ID of the parent view so
* chain and returns the synthetic Window ID of the parent view so
* dialog windows are correctly identified as transients by the policy layer.
* Phase 66: XDG popup initial configure — schedule configure for
* WLR_XDG_SURFACE_ROLE_POPUP so context menus and autocomplete dropdowns
* can commit their first buffer without stalling on the compositor.
* Phase 17: XWayland support — wlr_xwayland started alongside the headless
* backend; X11 windows (e.g. GNUstep apps) appear via new_surface events,
* receive synthetic WNativeWindow IDs equal to their xcb_window_t, and
* receive synthetic Window IDs equal to their xcb_window_t, and
* are managed through the same wl_toplevel_view / wManageWindow lifecycle
* as XDG toplevels. DISPLAY env var is set so X11 clients can connect.
* Phase 37: zwlr_data_control_manager_v1, zwlr_input_inhibitor_v1,
@ -234,7 +234,7 @@ static void wm_dock_app_remove(WNativeWindow id);
/*
* wl_toplevel_view -- one entry per XDG toplevel managed by the compositor.
* Holds the wlroots surface pointer, three lifecycle listeners, and a
* synthetic WNativeWindow ID used as the policy-layer window handle.
* synthetic Window ID used as the policy-layer window handle.
*/
struct wl_toplevel_view {
struct wlr_xdg_surface *xdg_surface;
@ -718,7 +718,7 @@ static void handle_pointer_motion_absolute(struct wl_listener *listener, void *d
static void handle_pointer_button(struct wl_listener *listener, void *data);
static void handle_pointer_frame(struct wl_listener *listener, void *data);
/* Phase 41: look up the view for a given synthetic WNativeWindow ID. */
/* Phase 41: look up the view for a given synthetic Window ID. */
static struct wl_toplevel_view *
wl_find_view_by_id(WNativeWindow id)
{
@ -1611,7 +1611,7 @@ handle_xwayland_ready(struct wl_listener *listener, void *data)
/*
* handle_xwayland_new_surface — called when a new X11 window connects.
* Allocates a wl_toplevel_view, uses window_id as the WNativeWindow ID,
* Allocates a wl_toplevel_view, uses window_id as the Window ID,
* and wires the lifecycle listeners to XWayland signals.
*/
static void
@ -1815,7 +1815,7 @@ handle_toplevel_commit(struct wl_listener *listener, void *data)
/*
* Phase 36 / 38: new XDG toplevel listener (wlroots 0.19+).
* Fires when the client calls get_toplevel on an xdg_surface.
* Allocates a wl_toplevel_view, assigns a synthetic WNativeWindow ID,
* Allocates a wl_toplevel_view, assigns a synthetic Window ID,
* wires lifecycle listeners, and sets up the initial commit handler.
*/
static void
@ -2187,7 +2187,7 @@ handle_backend_new_output(struct wl_listener *listener, void *data)
/* Set window title when running as a nested compositor. */
if (wl_state.is_nested && wl_state.wl_backend_inner &&
wlr_backend_is_wl(wl_state.wl_backend_inner))
wlr_wl_output_set_title(output, "WNativeWindow Maker");
wlr_wl_output_set_title(output, "Window Maker");
/* Create scene output and wire the frame renderer. */
if (wl_state.scene) {

2
src/backend/wayland/wl_backend.h
View File

@ -1,5 +1,5 @@
/*
* wl_backend.h -- wlroots-based Wayland compositor backend for WNativeWindow Maker
* wl_backend.h -- wlroots-based Wayland compositor backend for Window Maker
*
* Declares the WMBackend vtable instance implemented in wl_backend.c.
* Include this only from files that need to reference wl_backend directly

4
src/balloon.c
View File

@ -1,8 +1,8 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1998-2003 Alfredo K. Kojima
* Copyright (c) 2014-2016 WNativeWindow Maker Team
* Copyright (c) 2014-2016 Window Maker Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
src/balloon.h
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

2
src/client.c
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

2
src/client.h
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

2
src/colormap.c
View File

@ -1,6 +1,6 @@
/* colormap.c - colormap handling code
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1998-2003 Alfredo K. Kojima
*

2
src/colormap.h
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 2000-2003 Alfredo K. Kojima
*

2
src/cycling.c
View File

@ -1,6 +1,6 @@
/* cycling.c- window cycling
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 2000-2003 Alfredo K. Kojima
*

4
src/cycling.h
View File

@ -1,8 +1,8 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 2013 WNativeWindow Maker Team
* Copyright (c) 2013 Window Maker Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

4
src/defaults.c
View File

@ -1,10 +1,10 @@
/* defaults.c - manage configuration through defaults db
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu
* Copyright (c) 2014-2023 WNativeWindow Maker Team
* Copyright (c) 2014-2023 Window Maker Team
*
* This program is free software; you can redistribute it and/or modify

2
src/defaults.h
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

18
src/dialog.c
View File

@ -1,10 +1,10 @@
/* dialog.c - dialog windows for internal use
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu
* Copyright (c) 2014-2023 WNativeWindow Maker Team
* Copyright (c) 2014-2023 Window Maker Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -1147,7 +1147,7 @@ typedef struct {
#define COPYRIGHT_TEXT \
"Copyright \xc2\xa9 1997-2006 Alfredo K. Kojima\n"\
"Copyright \xc2\xa9 1998-2006 Dan Pascu\n"\
"Copyright \xc2\xa9 2013-%hu WNativeWindow Maker Developers Team"
"Copyright \xc2\xa9 2013-%hu Window Maker Developers Team"
static InfoPanel *infoPanel = NULL;
@ -1296,7 +1296,7 @@ void wShowInfoPanel(WScreen *scr)
"Lucida Sans,Comic Sans MS,URW Gothic L,Trebuchet MS:italic:pixelsize=%d:antialias=true",
WMScaleY(24));
font = WMCreateFont(scr->wmscreen, buffer);
strbuf = "WNativeWindow Maker";
strbuf = "Window Maker";
if (font) {
width = WMWidthOfString(font, strbuf, strlen(strbuf));
WMSetLabelFont(panel->name1L, font);
@ -1322,7 +1322,7 @@ void wShowInfoPanel(WScreen *scr)
font = NULL;
}
WMSetLabelTextAlignment(panel->name2L, WACenter);
WMSetLabelText(panel->name2L, _("WNativeWindow Manager for X"));
WMSetLabelText(panel->name2L, _("Window Manager for X"));
snprintf(buffer, sizeof(buffer), _("Version %s"), VERSION);
panel->versionL = WMCreateLabel(panel->win);
@ -1570,11 +1570,11 @@ void wShowLegalPanel(WScreen *scr)
WMMoveWidget(panel->licenseL, WMScaleX(8), WMScaleY(8));
WMSetLabelTextAlignment(panel->licenseL, WALeft);
WMSetLabelText(panel->licenseL,
_(" WNativeWindow Maker is free software; you can redistribute it and/or "
_(" Window Maker is free software; you can redistribute it and/or "
"modify it under the terms of the GNU General Public License as "
"published by the Free Software Foundation; either version 2 of the "
"License, or (at your option) any later version.\n\n"
" WNativeWindow Maker is distributed in the hope that it will be useful, "
" Window Maker is distributed in the hope that it will be useful, "
"but WITHOUT ANY WARRANTY; without even the implied warranty "
"of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. "
"See the GNU General Public License for more details.\n\n"
@ -1745,7 +1745,7 @@ int wShowCrashingDialogPanel(int whatSig)
WMResizeWidget(panel->noteL, PWIDTH - 20, 40);
WMMoveWidget(panel->noteL, 10, 90);
WMSetLabelTextAlignment(panel->noteL, WAJustified);
snprintf(buf, sizeof(buf), _("WNativeWindow Maker received signal %i."), whatSig);
snprintf(buf, sizeof(buf), _("Window Maker received signal %i."), whatSig);
WMSetLabelText(panel->noteL, buf);
panel->note2L = WMCreateLabel(panel->win);
@ -1770,7 +1770,7 @@ int wShowCrashingDialogPanel(int whatSig)
WMSetPopUpButtonPullsDown(panel->whatP, False);
WMSetPopUpButtonText(panel->whatP, _("Select action"));
WMAddPopUpButtonItem(panel->whatP, _("Abort and leave a core file"));
WMAddPopUpButtonItem(panel->whatP, _("Restart WNativeWindow Maker"));
WMAddPopUpButtonItem(panel->whatP, _("Restart Window Maker"));
WMAddPopUpButtonItem(panel->whatP, _("Start alternate window manager"));
WMSetPopUpButtonAction(panel->whatP, setCrashAction, panel);
WMSetPopUpButtonSelectedItem(panel->whatP, WMRestart);

2
src/dialog.h
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

4
src/dock.c
View File

@ -1,10 +1,10 @@
/* dock.c- built-in Dock module for WindowMaker
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu
* Copyright (c) 2009-2023 WNativeWindow Maker Team
* Copyright (c) 2009-2023 Window Maker Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
src/dock.h
View File

@ -1,6 +1,6 @@
/* dock.h- built-in Dock module for WindowMaker
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu

4
src/dockedapp.c
View File

@ -1,6 +1,6 @@
/* dockedapp.c- docked application settings panel
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1998-2003 Alfredo K. Kojima
*
@ -274,7 +274,7 @@ void ShowDockAppSettingsPanel(WAppIcon * aicon)
panel->autoLaunchBtn = WMCreateSwitchButton(vbox);
WMAddBoxSubview(vbox, WMWidgetView(panel->autoLaunchBtn), False, True, WMScaleY(20), WMScaleY(20), WMScaleY(2));
WMSetButtonText(panel->autoLaunchBtn, _("Start when WNativeWindow Maker is started"));
WMSetButtonText(panel->autoLaunchBtn, _("Start when Window Maker is started"));
WMSetButtonSelected(panel->autoLaunchBtn, aicon->auto_launch);
panel->lockBtn = WMCreateSwitchButton(vbox);

2
src/dockedapp.h
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu

4
src/event.c
View File

@ -1,9 +1,9 @@
/* event.c- event loop and handling
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 2014-2023 WNativeWindow Maker Team
* Copyright (c) 2014-2023 Window Maker Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

4
src/event.h
View File

@ -1,8 +1,8 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 2013 WNativeWindow Maker Team
* Copyright (c) 2013 Window Maker Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
src/framewin.c
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

2
src/framewin.h
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

2
src/icon.c
View File

@ -1,6 +1,6 @@
/* icon.c - window icon and dock and appicon parent
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

2
src/icon.h
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

4
src/keybind.h
View File

@ -1,8 +1,8 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 2014-2023 WNativeWindow Maker Team
* Copyright (c) 2014-2023 Window Maker Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

12
src/main.c
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
@ -225,7 +225,7 @@ void Restart(char *manager, Bool abortOnFailure)
wm_backend->display_close();
if (!prog) {
execvp(Arguments[0], Arguments);
wfatal(_("failed to restart WNativeWindow Maker."));
wfatal(_("failed to restart Window Maker."));
} else {
execvp(prog, argv);
werror(_("could not exec %s"), prog);
@ -440,7 +440,7 @@ noreturn void wAbort(Bool dumpCore)
static void print_help(void)
{
printf(_("Usage: %s [options]\n"), ProgName);
puts(_("The WNativeWindow Maker window manager for the X window system"));
puts(_("The Window Maker window manager for the X window system"));
puts("");
puts(_(" -display host:dpy display to use"));
#ifdef USE_ICCCM_WMREPLACE
@ -475,7 +475,7 @@ static void check_defaults(void)
if (system("wmaker.inst --batch") != 0) {
wwarning(_("There was an error while creating GNUstep directory, please "
"make sure you have installed WNativeWindow Maker correctly and run wmaker.inst"));
"make sure you have installed Window Maker correctly and run wmaker.inst"));
} else {
wwarning(_("%s directory created with default configuration."), path);
}
@ -665,7 +665,7 @@ static int real_main(int argc, char **argv)
wPreferences.flags.replace = 1;
#endif
} else if (strcmp(argv[i], "-version") == 0 || strcmp(argv[i], "--version") == 0) {
printf("WNativeWindow Maker %s\n", VERSION);
printf("Window Maker %s\n", VERSION);
exit(0);
} else if (strcmp(argv[i], "--global_defaults_path") == 0) {
printf("%s\n", PKGCONFDIR);
@ -700,7 +700,7 @@ static int real_main(int argc, char **argv)
#ifndef HAVE_INOTIFY
wPreferences.flags.noupdates = 1;
#else
wmessage(_("your version of WNativeWindow Maker was compiled with INotify support, so \"--no-polling\" has no effect"));
wmessage(_("your version of Window Maker was compiled with INotify support, so \"--no-polling\" has no effect"));
#endif
} else if (strcmp(argv[i], "--help") == 0) {
print_help();

2
src/main.h
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu

2
src/menu.c
View File

@ -1,6 +1,6 @@
/* menu.c- generic menu, used for root menu, application menus etc.
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu

2
src/menu.h
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

4
src/misc.c
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
@ -558,7 +558,7 @@ void ExecuteExitCommand(WScreen *scr, long quickmode)
oldSaveSessionFlag = wPreferences.save_session_on_exit;
r = wExitDialog(scr, _("Exit"),
_("Are you sure you want to quit WNativeWindow Maker?"), _("Exit"), _("Cancel"), NULL);
_("Are you sure you want to quit Window Maker?"), _("Exit"), _("Cancel"), NULL);
if (r == WAPRDefault) {
result = R_EXIT;

4
src/misc.h
View File

@ -1,8 +1,8 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 2013-2023 WNativeWindow Maker Team
* Copyright (c) 2013-2023 Window Maker Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

12
src/monitor.c
View File

@ -1,6 +1,6 @@
/* monitor.c - monitors the wmaker process
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2004 Alfredo K. Kojima
*
@ -77,21 +77,21 @@ int MonitorLoop(int argc, char **argv)
for (;;) {
last_start = time(NULL);
/* Start WNativeWindow Maker */
/* Start Window Maker */
pid = fork();
if (pid == 0) {
execvp(child_argv[0], child_argv);
werror(_("Error respawning WNativeWindow Maker"));
werror(_("Error respawning Window Maker"));
exit(1);
} else if (pid < 0) {
werror(_("Error respawning WNativeWindow Maker"));
werror(_("Error respawning Window Maker"));
exit(1);
}
do {
exited = waitpid(-1, &status, 0);
if (exited < 0) {
werror(_("Error during monitoring of WNativeWindow Maker process."));
werror(_("Error during monitoring of Window Maker process."));
error = True;
break;
}
@ -116,7 +116,7 @@ int MonitorLoop(int argc, char **argv)
return 1;
}
}
wwarning(_("WNativeWindow Maker exited due to a crash (signal %i) and will be restarted."),
wwarning(_("Window Maker exited due to a crash (signal %i) and will be restarted."),
WTERMSIG(status));
} else
break;

4
src/monitor.h
View File

@ -1,8 +1,8 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 2013 WNativeWindow Maker Team
* Copyright (c) 2013 Window Maker Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
src/motif.c
View File

@ -1,6 +1,6 @@
/* motif.c-- stuff for support for mwm hints
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1998-2003 Alfredo K. Kojima
*

2
src/motif.h
View File

@ -1,6 +1,6 @@
/* motif.h-- stuff for support for mwm hints
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1998-2003 Alfredo K. Kojima
*

2
src/moveres.c
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

2
src/osdep.h
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

2
src/pixmap.c
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

2
src/pixmap.h
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

2
src/placement.c
View File

@ -1,6 +1,6 @@
/* placement.c - window and icon placement on screen
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

4
src/placement.h
View File

@ -1,9 +1,9 @@
/* placement.h - window and icon placement on screen
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 2013-2016 WNativeWindow Maker Team
* Copyright (c) 2013-2016 Window Maker Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
src/properties.c
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

2
src/properties.h
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

2
src/resources.c
View File

@ -1,6 +1,6 @@
/* resources.c - manage X resources (colors etc)
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

2
src/resources.h
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

8
src/rootmenu.c
View File

@ -1,10 +1,10 @@
/* rootmenu.c- user defined menu
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu
* Copyright (c) 2014-2023 WNativeWindow Maker Team
* Copyright (c) 2014-2023 Window Maker Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -176,7 +176,7 @@ static void shutdownCommand(WMenu * menu, WMenuEntry * entry)
r = wExitDialog(menu->frame->screen_ptr,
_("Kill X session"),
_("Kill WNativeWindow System session?\n"
_("Kill Window System session?\n"
"(all applications will be closed)"), _("Kill"), _("Cancel"), NULL);
if (r == WAPRDefault) {
result = R_KILL;
@ -801,7 +801,7 @@ static WMenuEntry *addWindowsMenu(WScreen *scr, WMenu *menu, const char *title)
} else {
scr->flags.added_windows_menu = 1;
wwmenu = wMenuCreate(scr, _("WNativeWindow List"), False);
wwmenu = wMenuCreate(scr, _("Window List"), False);
wwmenu->on_destroy = cleanupWindowsMenu;
scr->switch_menu = wwmenu;
wwin = scr->focused_window;

2
src/rootmenu.h
View File

@ -1,6 +1,6 @@
/* rootmenu.h- user defined menu
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 2000-2003 Alfredo K. Kojima
*

4
src/screen.c
View File

@ -1,6 +1,6 @@
/* screen.c - screen management
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
@ -626,7 +626,7 @@ void ScreenCapture(WScreen *scr, int mode)
}
if (img) {
if (RSaveTitledImage(img, filepath, (char *)(filetype + 1), "Screenshot from WNativeWindow Maker")) {
if (RSaveTitledImage(img, filepath, (char *)(filetype + 1), "Screenshot from Window Maker")) {
scale_img = RSmoothScaleImage(img, scr->scr_width / 10, scr->scr_height / 10);
wm_backend->screen_show_mini_screenshot(scr, scale_img);
RReleaseImage(scale_img);

2
src/screen.h
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

2
src/session.c
View File

@ -3,7 +3,7 @@
* Copyright (c) 1998-2003 Dan Pascu
* Copyright (c) 1998-2003 Alfredo Kojima
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
src/session.h
View File

@ -2,7 +2,7 @@
*
* Copyright (c) 1999-2003 Alfredo K. Kojima
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
src/shutdown.c
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

4
src/shutdown.h
View File

@ -1,8 +1,8 @@
/* shutdown.c - Shutdown functions
*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 2013 WNativeWindow Maker Team
* Copyright (c) 2013 Window Maker Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
src/stacking.c
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu

2
src/stacking.h
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
*

4
src/startup.c
View File

@ -1,5 +1,5 @@
/*
* WNativeWindow Maker window manager
* Window Maker window manager
*
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu
@ -360,7 +360,7 @@ void StartUp(Bool defaultScreenOnly)
sigaction(SIGCHLD, &sig_action, NULL);
/* Now we unblock all signals, that may have been blocked by the parent
* who exec()-ed us. This can happen for example if WNativeWindow Maker crashes
* who exec()-ed us. This can happen for example if Window Maker crashes
* and restarts itself or another window manager from the signal handler.
* In this case, the new process inherits the blocked signal mask and
* will no longer react to that signal, until unblocked.

Some files were not shown because too many files have changed in this diff Show More