gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-02-03 06:45:51 +01:00
Code Issues Projects Releases Wiki Activity

- made deiconification not automatically focus window in sloppy focus

Browse Source 
- fixed crash with DisableMiniwindows and icon pixmap changes
- fixed crash when changing icon of window without WM_CLASS
- added IAmAnnoyingAndDontWantWorkspaceNameDisplay
- added hysteresys for offscreen menu scrollback
- fixed bug with IgnoreFocusClick
- fixed crash with windows with width == 1 (Alban Hertroys
					<dalroi@wit401310.student.utwente.nl>)
- added SHEXEC command
- fixed resizebarback for SHADOW_RESIZEBAR ( jim knoble jmknoble@pobox.com)
This commit is contained in:
kojima
1999-04-24 20:08:20 +00:00
parent 446c02aa5c
commit 7f01849758
41 changed files with 851 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
WPrefs.app/Menu.c
View File

@@ -101,23 +101,25 @@ enum {
enum {
CpExec = 0,
CpArrange = 1,
CpHide = 2,
CpShow = 3,
CpExit = 4,
CpShutdown = 5,
CpRestart = 6,
CpRestartWM = 7,
CpSaveSession = 8,
CpClearSession = 9,
CpRefresh = 10,
CpInfo = 11,
CpLegal = 12
CpShExec = 1,
CpArrange = 2,
CpHide = 3,
CpShow = 4,
CpExit = 5,
CpShutdown = 6,
CpRestart = 7,
CpRestartWM = 8,
CpSaveSession = 9,
CpClearSession = 10,
CpRefresh = 11,
CpInfo = 12,
CpLegal = 13
};
enum {
TNothing,
TExec,
TShExec,
TSimpleCommand,
TRestart,
TRestartWM,
@@ -375,7 +377,8 @@ updateForItemType(_Panel *panel, int type)
} else {
WMMapWidget(panel->shoF);
}
if (type==TExec || type==TRestart || type==TExternalMenu) {
if (type==TExec || type == TShExec || type==TRestart
|| type==TExternalMenu) {
WMMapWidget(panel->proF);
} else {
WMUnmapWidget(panel->proF);
@@ -403,7 +406,9 @@ updateForItemType(_Panel *panel, int type)
if (type == TRestart) {
WMSetFrameTitle(panel->proF, _("Window Manager"));
} else if (type == TExternalMenu) {
WMSetFrameTitle(panel->proF, _("Program to open files"));
WMSetFrameTitle(panel->proF, _("Program to Open Files"));
} else if (type == TShExec) {
WMSetFrameTitle(panel->proF, _("Command to Execute"));
} else {
WMSetFrameTitle(panel->proF, _("Program to Run"));
}
@@ -623,6 +628,10 @@ browserClick(WMWidget *w, void *data)
WMSetTextFieldText(panel->proT, getItemParameter(item));
WMSetPopUpButtonSelectedItem(panel->cmdP, CpExec);
updateForItemType(panel, TExec);
} else if (strcmp(command, "SHEXEC")==0) {
WMSetTextFieldText(panel->proT, getItemParameter(item));
WMSetPopUpButtonSelectedItem(panel->cmdP, CpShExec);
updateForItemType(panel, TShExec);
} else if (strcmp(command, "WORKSPACE_MENU")==0) {
updateForItemType(panel, TWSMenu);
} else if (strcmp(command, "EXIT")==0) {
@@ -733,7 +742,8 @@ changedItem(void *observerData, WMNotification *notification)
litem->text = str;
WMRedisplayWidget(list);
} else if (strcmp(command, "EXEC")==0
} else if (strcmp(command, "EXEC")==0
|| strcmp(command, "SHEXEC")==0
|| strcmp(command, "RESTART")==0) {
if (t == panel->proT) {
str = WMGetTextFieldText(t);
@@ -821,6 +831,15 @@ changedCommand(WMWidget *w, void *data)
updateForItemType(panel, TExec);
}
break;
case CpShExec:
if (strcmp(getItemCommand(panel->editedItem), "SHEXEC")!=0) {
changeItemCommand(panel->editedItem, "SHEXEC");
tmp = WMGetTextFieldText(panel->proT);
changeItemParameter(panel->editedItem, tmp);
free(tmp);
updateForItemType(panel, TShExec);
}
break;
case CpArrange:
if (strcmp(getItemCommand(panel->editedItem), "ARRANGE_ICONS")!=0) {
changeItemCommand(panel->editedItem, "ARRANGE_ICONS");
@@ -993,7 +1012,6 @@ scrolledBrowser(void *observerData, WMNotification *notification)
{
_Panel *panel = (_Panel*)observerData;
int column;
WMList *list;
proplist_t item;
column = WMGetBrowserFirstVisibleColumn(panel->browser);
@@ -1132,12 +1150,13 @@ createPanel(_Panel *p)
WMResizeWidget(panel->cmdP, 170, 20);
WMMoveWidget(panel->cmdP, 10, 20);
WMAddPopUpButtonItem(panel->cmdP, _("Run Program"));
WMAddPopUpButtonItem(panel->cmdP, _("Execute Shell Command"));
WMAddPopUpButtonItem(panel->cmdP, _("Arrange Icons"));
WMAddPopUpButtonItem(panel->cmdP, _("Hide Others"));
WMAddPopUpButtonItem(panel->cmdP, _("Show All Windows"));
WMAddPopUpButtonItem(panel->cmdP, _("Exit WindowMaker"));
WMAddPopUpButtonItem(panel->cmdP, _("Exit X Session"));
WMAddPopUpButtonItem(panel->cmdP, _("Start window manager"));
WMAddPopUpButtonItem(panel->cmdP, _("Start Window Manager"));
WMAddPopUpButtonItem(panel->cmdP, _("Restart WindowMaker"));
WMAddPopUpButtonItem(panel->cmdP, _("Save Session"));
WMAddPopUpButtonItem(panel->cmdP, _("Clear Session"));

3
WPrefs.app/WPrefs.c
View File

@@ -303,7 +303,8 @@ createMainWindow(WMScreen *scr)
WMResizeWidget(WPrefs.versionL, FRAME_WIDTH-20, 20);
WMMoveWidget(WPrefs.versionL, 10, 65);
WMSetLabelTextAlignment(WPrefs.versionL, WACenter);
sprintf(buffer, _("Version %s for Window Maker %s"), WVERSION, WMVERSION);
sprintf(buffer, _("Version %s for Window Maker %s or newer"), WVERSION,
WMVERSION);
WMSetLabelText(WPrefs.versionL, buffer);
WPrefs.statusL = WMCreateLabel(WPrefs.banner);

2
WPrefs.app/WPrefs.h
View File

@@ -43,7 +43,7 @@
/****/
#define WVERSION "0.31"
#define WMVERSION "0.52.x"
#define WMVERSION "0.53.x"
extern char *NOptionValueChanged;

9
WPrefs.app/po/Makefile.in
View File

@@ -120,9 +120,9 @@ all: all-redirect
.SUFFIXES:
.SUFFIXES: .mo .po
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WPrefs.app/po/Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu WPrefs.app/po/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -135,6 +135,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = WPrefs.app/po
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WPrefs.app/po/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \

9
WPrefs.app/xpm/Makefile.in
View File

@@ -109,9 +109,9 @@ GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WPrefs.app/xpm/Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu WPrefs.app/xpm/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -143,6 +143,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = WPrefs.app/xpm
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WPrefs.app/xpm/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \