gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-04-25 10:01:26 +02:00
Code Issues Projects Releases Wiki Activity

- Fixed crashing bug in menu.c

Browse Source 
- Updated year from 2002 to 2003
This commit is contained in:
dan
2003-01-16 23:30:45 +00:00
parent f3487c1ea2
commit 4153e2fde4
156 changed files with 250 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GNUstep.h
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/WindowMaker.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/actions.c
+2 -7
View File
@@ -2,8 +2,8 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1998-2002 Dan Pascu
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu
*
* 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
@@ -462,19 +462,14 @@ wMaximizeWindow(WWindow *wwin, int directions)
#endif
if (directions & MAX_HORIZONTAL) {
new_width = (usableArea.x2-usableArea.x1)-FRAME_BORDER_WIDTH*2;
new_x = usableArea.x1;
} else {
new_x = wwin->frame_x;
new_width = wwin->frame->core->width;
}
if (directions & MAX_VERTICAL) {
new_height = (usableArea.y2-usableArea.y1)-FRAME_BORDER_WIDTH*2;
new_y = usableArea.y1;
if (WFLAGP(wwin, full_maximize)) {
src/actions.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/appicon.c
+2 -2
View File
@@ -2,8 +2,8 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1998-2002 Dan Pascu
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu
*
* 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
src/appicon.h
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/application.c
+2 -2
View File
@@ -1,8 +1,8 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1998-2002 Dan Pascu
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu
*
* 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
src/application.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/appmenu.c
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/appmenu.h
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/balloon.c
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1998-2002 Alfredo K. Kojima
* Copyright (c) 1998-2003 Alfredo K. Kojima
*
* 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
src/balloon.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/client.c
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/client.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/colormap.c
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1998-2002 Alfredo K. Kojima
* Copyright (c) 1998-2003 Alfredo K. Kojima
*
* This code slightly based on fvwm code,
* Copyright (c) Rob Nation and others
src/cycling.c
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 2000-2002 Alfredo K. Kojima
* Copyright (c) 2000-2003 Alfredo K. Kojima
*
* 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
src/defaults.c
+2 -2
View File
@@ -2,8 +2,8 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1998-2002 Dan Pascu
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu
*
* 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
src/defaults.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/dialog.c
+4 -4
View File
@@ -2,8 +2,8 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1998-2002 Dan Pascu
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu
*
* 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
@@ -859,8 +859,8 @@ typedef struct {
#define COPYRIGHT_TEXT \
"Copyright \xa9 1997-2002 Alfredo K. Kojima <kojima@windowmaker.org>\n"\
"Copyright \xa9 1998-2002 Dan Pascu <dan@windowmaker.org>"
"Copyright \xa9 1997-2003 Alfredo K. Kojima <kojima@windowmaker.org>\n"\
"Copyright \xa9 1998-2003 Dan Pascu <dan@windowmaker.org>"
src/dialog.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/dock.c
+2 -2
View File
@@ -2,8 +2,8 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1998-2002 Dan Pascu
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu
*
* 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
src/dock.h
+2 -2
View File
@@ -2,8 +2,8 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1998-2002 Dan Pascu
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu
*
* 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
src/dockedapp.c
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1998-2002 Alfredo K. Kojima
* Copyright (c) 1998-2003 Alfredo K. Kojima
*
* 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
src/event.c
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/framewin.c
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/framewin.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/funcs.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/gnome.c
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1998-2002 Alfredo K. Kojima
* Copyright (c) 1998-2003 Alfredo K. Kojima
*
* 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
src/gnome.h
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1998-2002 Alfredo K. Kojima
* Copyright (c) 1998-2003 Alfredo K. Kojima
*
* 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
src/icon.c
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/icon.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/keybind.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/kwm.c
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1998-2002 Alfredo K. Kojima
* Copyright (c) 1998-2003 Alfredo K. Kojima
*
* 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
src/kwm.h
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1998-2002 Alfredo K. Kojima
* Copyright (c) 1998-2003 Alfredo K. Kojima
*
* 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
src/main.c
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/menu.c
+37 -16
View File
@@ -2,8 +2,8 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1998-2002 Dan Pascu
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu
*
* 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
@@ -1949,24 +1949,32 @@ menuMouseDown(WObjDescriptor *desc, XEvent *event)
int old_frame_y = 0;
delay_data d_data = {NULL, NULL, NULL};
/* Doesn't seem to be needed anymore (if delayed selection handler is
* added only if not present). there seem to be no other side effects
* from removing this and it is also possible that it was only added
* to avoid problems with adding the delayed selection timer handler
* multiple times
*/
/*if (menu->flags.inside_handler) {
return;
}*/
menu->flags.inside_handler = 1;
if (!wPreferences.wrap_menus) {
smenu = parentMenu(menu);
old_frame_x = smenu->frame_x;
old_frame_y = smenu->frame_y;
} else if (event->xbutton.window == menu->frame->core->window) {
/* This is true if the menu was launched with right click on root window */
delayed_select = 1;
d_data.delayed_select = &delayed_select;
d_data.menu = menu;
d_data.magic = WMAddTimerHandler(wPreferences.dblclick_time,
delaySelection, &d_data);
if (!d_data.magic) {
delayed_select = 1;
d_data.delayed_select = &delayed_select;
d_data.menu = menu;
d_data.magic = WMAddTimerHandler(wPreferences.dblclick_time,
delaySelection, &d_data);
}
}
if (menu->flags.inside_handler) {
return;
}
menu->flags.inside_handler = 1;
wRaiseFrame(menu->frame->core);
close_on_exit = (bev->send_event || menu->flags.brother);
@@ -2102,8 +2110,8 @@ menuMouseDown(WObjDescriptor *desc, XEvent *event)
if (menu != smenu) {
if (d_data.magic) {
WMDeleteTimerHandler(d_data.magic);
d_data.magic = NULL;
}
d_data.magic = NULL;
} else if (moved_to_submenu) {
/* while we are moving, postpone the selection */
if (d_data.magic) {
@@ -2118,9 +2126,10 @@ menuMouseDown(WObjDescriptor *desc, XEvent *event)
prevy = ev.xmotion.y_root;
break;
} else {
if (d_data.magic)
if (d_data.magic) {
WMDeleteTimerHandler(d_data.magic);
d_data.magic = NULL;
d_data.magic = NULL;
}
}
}
}
@@ -2180,8 +2189,10 @@ menuMouseDown(WObjDescriptor *desc, XEvent *event)
WMDeleteTimerHandler(menu->timer);
menu->timer = NULL;
}
if (d_data.magic!=NULL)
if (d_data.magic!=NULL) {
WMDeleteTimerHandler(d_data.magic);
d_data.magic = NULL;
}
if (menu && menu->selected_entry>=0) {
entry = menu->entries[menu->selected_entry];
@@ -2236,6 +2247,16 @@ menuMouseDown(WObjDescriptor *desc, XEvent *event)
wMenuMove(parentMenu(desc->parent), old_frame_x, old_frame_y, True);
byebye:
/* Just to be sure in case we skip the 2 above because of a goto byebye */
if (menu && menu->timer) {
WMDeleteTimerHandler(menu->timer);
menu->timer = NULL;
}
if (d_data.magic!=NULL) {
WMDeleteTimerHandler(d_data.magic);
d_data.magic = NULL;
}
((WMenu*)desc->parent)->flags.inside_handler = 0;
#ifdef VIRTUAL_DESKTOP
if (wPreferences.vedge_thickness) {
src/menu.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/menureader.c
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 2000-2002 Alfredo K. Kojima
* Copyright (c) 2000-2003 Alfredo K. Kojima
*
* 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
src/misc.c
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/motif.c
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1998-2002 Alfredo K. Kojima
* Copyright (c) 1998-2003 Alfredo K. Kojima
*
* 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
src/motif.h
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1998-2002 Alfredo K. Kojima
* Copyright (c) 1998-2003 Alfredo K. Kojima
*
* 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
src/moveres.c
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/openlook.c
+1 -1
View File
@@ -3,7 +3,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1998-2002 Alfredo K. Kojima
* Copyright (c) 1998-2003 Alfredo K. Kojima
*
* 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
src/openlook.h
+1 -1
View File
@@ -3,7 +3,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1998-2002 Alfredo K. Kojima
* Copyright (c) 1998-2003 Alfredo K. Kojima
*
* 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
src/pixmap.c
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/pixmap.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/placement.c
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/properties.c
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/properties.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/resources.c
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/resources.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/rootmenu.c
+3 -3
View File
@@ -2,8 +2,8 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1998-2002 Dan Pascu
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu
*
* 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
@@ -1807,7 +1807,7 @@ OpenRootMenu(WScreen *scr, int x, int y, int keyboard)
domain = WMCreatePLString("WMRootMenu");
}
*/
scr->flags.root_menu_changed_shortcuts = 0;
scr->flags.added_workspace_menu = 0;
scr->flags.added_windows_menu = 0;
src/rootmenu.h
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 2000-2002 Alfredo K. Kojima
* Copyright (c) 2000-2003 Alfredo K. Kojima
*
* 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
src/screen.c
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/screen.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/session.c
+2 -2
View File
@@ -1,7 +1,7 @@
/* session.c - session state handling and R6 style session management
*
* Copyright (c) 1998-2002 Dan Pascu
* Copyright (c) 1998-2002 Alfredo Kojima
* Copyright (c) 1998-2003 Dan Pascu
* Copyright (c) 1998-2003 Alfredo Kojima
*
* Window Maker window manager
*
src/session.h
+1 -1
View File
@@ -1,6 +1,6 @@
/* session.h
*
* Copyright (c) 1999-2002 Alfredo K. Kojima
* Copyright (c) 1999-2003 Alfredo K. Kojima
*
* Window Maker window manager
*
src/shutdown.c
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/stacking.c
+17 -11
View File
@@ -1,8 +1,8 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1998-2002 Dan Pascu
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu
*
* 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
@@ -208,10 +208,12 @@ wRaiseFrame(WCoreWindow *frame)
frame->stacking->under->stacking->above = frame->stacking->above;
if (frame->stacking->above)
frame->stacking->above->stacking->under = frame->stacking->under;
frame->stacking->above = NULL;
frame->stacking->under = WMGetFromBag(scr->stacking_list, level);
frame->stacking->under->stacking->above = frame;
if (frame->stacking->under) {
frame->stacking->under->stacking->above = frame;
}
WMSetInBag(scr->stacking_list, level, frame);
/* raise transients under us from bottom to top
@@ -325,9 +327,9 @@ wLowerFrame(WCoreWindow *frame)
wlist = WMGetFromBag(scr->stacking_list, level);
/* look for place to put this window */
{
if (wlist) {
WCoreWindow *owner = frame->stacking->child_of;
if (owner != wlist) {
while (wlist->stacking->under) {
/* if this is a transient, it should not be placed under
@@ -337,13 +339,17 @@ wLowerFrame(WCoreWindow *frame)
wlist = wlist->stacking->under;
}
}
}
}
/* insert under the place found */
frame->stacking->above = wlist;
frame->stacking->under = wlist->stacking->under;
if (wlist->stacking->under)
wlist->stacking->under->stacking->above = frame;
wlist->stacking->under = frame;
if (wlist) {
frame->stacking->under = wlist->stacking->under;
if (wlist->stacking->under)
wlist->stacking->under->stacking->above = frame;
wlist->stacking->under = frame;
} else {
frame->stacking->under = NULL;
}
if (frame->stacking->above == NULL) {
WMBagIterator iter;
src/stacking.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/startup.c
+2 -2
View File
@@ -1,8 +1,8 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1998-2002 Dan Pascu
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu
*
* 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
src/superfluous.c
+2 -2
View File
@@ -1,8 +1,8 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1998-2002 Dan Pascu
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu
*
* 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
src/superfluous.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/switchmenu.c
+1 -1
View File
@@ -2,7 +2,7 @@
* Window Maker window manager
*
* Copyright (c) 1997 Shige Abe
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/texture.c
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/texture.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/wconfig.h.in
+1 -1
View File
@@ -3,7 +3,7 @@
*
* WindowMaker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/wcore.c
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/wcore.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/wdefaults.c
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/wdefaults.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/window.c
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/window.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/winmenu.c
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/winspector.c
+2 -2
View File
@@ -2,8 +2,8 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1998-2002 Dan Pascu
* Copyright (c) 1997-2003 Alfredo K. Kojima
* Copyright (c) 1998-2003 Dan Pascu
*
* 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
src/winspector.h
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/wmspec.c
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1998-2002 Alfredo K. Kojima
* Copyright (c) 1998-2003 Alfredo K. Kojima
*
* 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
src/wmspec.h
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1998-2002 Alfredo K. Kojima
* Copyright (c) 1998-2003 Alfredo K. Kojima
*
* 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
src/workspace.c
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/workspace.h
+1 -1
View File
@@ -2,7 +2,7 @@
*
* Window Maker window manager
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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
src/xutil.c
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* WindowMaker miscelaneous functions
*
* Copyright (c) 1997-2002 Alfredo K. Kojima
* Copyright (c) 1997-2003 Alfredo K. Kojima
*
* 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