1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00

*** empty log message ***

This commit is contained in:
kojima
1999-04-17 23:11:34 +00:00
parent 8bdc78fcd1
commit 9eb4f894d0
9 changed files with 17 additions and 16 deletions

2
NEWS
View File

@@ -2,7 +2,7 @@
NEWS for veteran Window Maker users NEWS for veteran Window Maker users
----------------------------------- -----------------------------------
--- 0.52.1 --- 0.53.0
New Options New Options
----------- -----------

View File

@@ -10,7 +10,7 @@ AC_INIT(src/WindowMaker.h)
AM_INIT_AUTOMAKE(WindowMaker, 0.52.1) AM_INIT_AUTOMAKE(WindowMaker, 0.53.0)
AM_PROG_LIBTOOL AM_PROG_LIBTOOL

View File

@@ -646,6 +646,7 @@ iconExpose(WObjDescriptor *desc, XEvent *event)
wAppIconPaint(desc->parent); wAppIconPaint(desc->parent);
} }
static void static void
iconDblClick(WObjDescriptor *desc, XEvent *event) iconDblClick(WObjDescriptor *desc, XEvent *event)
{ {
@@ -676,17 +677,15 @@ iconDblClick(WObjDescriptor *desc, XEvent *event)
return; return;
} }
#endif /* REDUCE_APPICONS */ #endif /* REDUCE_APPICONS */
printf("%i\n",wapp->refcount);
unhideHere = (event->xbutton.state & ShiftMask); unhideHere = (event->xbutton.state & ShiftMask);
/* go to the last workspace that the user worked on the app */ /* go to the last workspace that the user worked on the app */
if (!unhideHere) if (!unhideHere && wapp->last_workspace != scr->current_workspace)
wWorkspaceChange(scr, wapp->last_workspace); wWorkspaceChange(scr, wapp->last_workspace);
wUnhideApplication(wapp, event->xbutton.button==Button2, unhideHere); wUnhideApplication(wapp, event->xbutton.button==Button2, unhideHere);
if (event->xbutton.state & MOD_MASK) { if (event->xbutton.state & MOD_MASK) {
wHideOtherApplications(aicon->icon->owner); wHideOtherApplications(aicon->icon->owner);
} }

View File

@@ -169,6 +169,7 @@ Exit(int status)
exit(status); exit(status);
} }
void void
Restart(char *manager, Bool abortOnFailure) Restart(char *manager, Bool abortOnFailure)
{ {

View File

@@ -429,7 +429,7 @@ get_object(FILE *f)
ungetc(c, f); ungetc(c, f);
pl = get_string(f); pl = get_string(f);
} else { } else {
COMPLAIN(_("was expecting a string, dictionary, data or array.")); COMPLAIN(_("was expecting a string, dictionary, data or array. If it's a string, try enclosing it with \"."));
if (c=='#' || c=='/') { if (c=='#' || c=='/') {
wwarning(_("Comments are not allowed inside WindowMaker owned domain files.")); wwarning(_("Comments are not allowed inside WindowMaker owned domain files."));
} }

View File

@@ -317,6 +317,7 @@ handleSig(int sig)
XCloseDisplay(dpy); XCloseDisplay(dpy);
dpy = XOpenDisplay(""); dpy = XOpenDisplay("");
if (dpy) { if (dpy) {
XGrabServer(dpy);
crashAction = wShowCrashingDialogPanel(sig); crashAction = wShowCrashingDialogPanel(sig);
XCloseDisplay(dpy); XCloseDisplay(dpy);
dpy = NULL; dpy = NULL;

View File

@@ -309,7 +309,7 @@
#define DEF_CLIP_TITLE_FONT "\"-*-helvetica-bold-r-normal-*-10-*-*-*-*-*-*-*\"" #define DEF_CLIP_TITLE_FONT "\"-*-helvetica-bold-r-normal-*-10-*-*-*-*-*-*-*\""
#define DEF_INFO_TEXT_FONT "\"-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*\"" #define DEF_INFO_TEXT_FONT "\"-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*\""
#define DEF_WORKSPACE_NAME_FONT "-*-times-bold-i-normal--24-*" #define DEF_WORKSPACE_NAME_FONT "-*-lucida-bold-r-normal--24-*"
#endif /* !I18N_MB */ #endif /* !I18N_MB */
#define HELVETICA10_FONT "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*" #define HELVETICA10_FONT "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*"

View File

@@ -1570,6 +1570,8 @@ wWindowFocus(WWindow *wwin, WWindow *owin)
return; return;
} }
oowner = wWindowFor(owin->transient_for);
/* new window is owner of old window */ /* new window is owner of old window */
if (wwin == oowner) { if (wwin == oowner) {
wWindowUnfocus(owin); wWindowUnfocus(owin);
@@ -1582,7 +1584,6 @@ wWindowFocus(WWindow *wwin, WWindow *owin)
} }
/* new window has same owner of old window */ /* new window has same owner of old window */
oowner = wWindowFor(owin->transient_for);
if (oowner == nowner) { if (oowner == nowner) {
/* prevent unfocusing of owner */ /* prevent unfocusing of owner */
oowner->flags.semi_focused = 0; oowner->flags.semi_focused = 0;

View File

@@ -236,7 +236,6 @@ static void
hideWorkpaceName(void *data) hideWorkpaceName(void *data)
{ {
WScreen *scr = (WScreen*)data; WScreen *scr = (WScreen*)data;
if (!scr->workspace_name_data || scr->workspace_name_data->count == 0) { if (!scr->workspace_name_data || scr->workspace_name_data->count == 0) {
XUnmapWindow(dpy, scr->workspace_name); XUnmapWindow(dpy, scr->workspace_name);
@@ -253,6 +252,9 @@ hideWorkpaceName(void *data)
RImage *img = RCloneImage(scr->workspace_name_data->back); RImage *img = RCloneImage(scr->workspace_name_data->back);
Pixmap pix; Pixmap pix;
scr->workspace_name_timer = WMAddTimerHandler(30, hideWorkpaceName,
scr);
RCombineImagesWithOpaqueness(img, scr->workspace_name_data->text, RCombineImagesWithOpaqueness(img, scr->workspace_name_data->text,
scr->workspace_name_data->count*255/10); scr->workspace_name_data->count*255/10);
@@ -266,9 +268,6 @@ hideWorkpaceName(void *data)
XFlush(dpy); XFlush(dpy);
scr->workspace_name_data->count--; scr->workspace_name_data->count--;
scr->workspace_name_timer = WMAddTimerHandler(40, hideWorkpaceName,
scr);
} }
} }
@@ -375,7 +374,7 @@ showWorkspaceName(WScreen *scr, int workspace)
scr->workspace_name_data = data; scr->workspace_name_data = data;
scr->workspace_name_timer = WMAddTimerHandler(200, hideWorkpaceName, scr); scr->workspace_name_timer = WMAddTimerHandler(300, hideWorkpaceName, scr);
return; return;