[repo.or.cz] wmaker-crm.git branch next updated: wmaker-0.95.3-210-geae7ef6
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via eae7ef6c596f0a8db8000d4590e367b88ba9dbbb (commit)
via ea7ef65b1911bce189e81c29dc87e73263261cf9 (commit)
from e393c6b61a5b3b7792e85b9092798e7bdd1e184d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://repo.or.cz/w/wmaker-crm.git/commit/eae7ef6c596f0a8db8000d4590e367b88ba9dbbb
commit eae7ef6c596f0a8db8000d4590e367b88ba9dbbb
Author: Amadeusz SÅawiÅski am...@asmblr.net
Date: Fri Nov 23 20:16:59 2012 +0100
Fix Maximize/Unmaximize in window menu
Add variable to track window startup size and use it when checking for
changes
diff --git a/src/moveres.c b/src/moveres.c
index 59dd0d2..44ddefa 100644
--- a/src/moveres.c
+++ b/src/moveres.c
@@ -1211,6 +1211,8 @@ int wKeyboardMoveResizeWindow(WWindow * wwin)
int vert_border = wwin-frame-top_width + wwin-frame-bottom_width;
int src_x = wwin-frame_x;
int src_y = wwin-frame_y;
+ int original_w = w;
+ int original_h = h;
int done, off_x, off_y, ww, wh;
int kspeed = _KS;
int opaqueMoveResize = wPreferences.opaque_move_resize_keyboard;
@@ -1517,10 +1519,10 @@ int wKeyboardMoveResizeWindow(WWindow * wwin)
}
}
} else {
- if (wwin-client.width != ww)
+ if (ww != original_w)
wwin-flags.maximized =
~(MAX_HORIZONTAL | MAX_MAXIMUS);
- if (wwin-client.height != wh -
vert_border)
+ if (wh != original_h)
wwin-flags.maximized =
~(MAX_VERTICAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_MAXIMUS);
wWindowConfigure(wwin, src_x + off_x,
src_y + off_y, ww, wh - vert_border);
@@ -1877,6 +1879,8 @@ void wMouseResizeWindow(WWindow * wwin, XEvent * ev)
int orig_fy = fy;
int orig_fw = fw;
int orig_fh = fh;
+ int original_fw = fw;
+ int original_fh = fh;
int head = ((wPreferences.auto_arrange_icons wXineramaHeads(scr) 1)
? wGetHeadForWindow(wwin)
: scr-xine_info.primary_head);
@@ -2072,10 +2076,10 @@ void wMouseResizeWindow(WWindow * wwin, XEvent * ev)
WMUnmapWidget(scr-gview);
XUngrabServer(dpy);
- if (wwin-client.width != fw)
+ if (fw != original_fw)
wwin-flags.maximized =
~(MAX_HORIZONTAL | MAX_MAXIMUS);
- if (wwin-client.height != fh - vert_border)
+ if (fh != original_fh)
wwin-flags.maximized = ~(MAX_VERTICAL
| MAX_LEFTHALF | MAX_RIGHTHALF | MAX_MAXIMUS);
wWindowConfigure(wwin, fx, fy, fw, fh -
vert_border);
http://repo.or.cz/w/wmaker-crm.git/commit/ea7ef65b1911bce189e81c29dc87e73263261cf9
commit ea7ef65b1911bce189e81c29dc87e73263261cf9
Author: John H. Robinson, IV jaq...@sbih.org
Date: Wed Nov 14 12:15:44 2012 -0800
Makefile: Add forgotten .h files
Please find attached a diff to add the missing .h files from src/Makefile.am
One way to find these:
$ git checkout next
$ ./autogen.sh
$ ./configure
$ make dist-gzip
$ tar xzf WindowMaker-0.95.3.tar.gz
$ cd WindowMaker-0.95.3
$ ./configure
$ make
diff --git a/src/Makefile.am b/src/Makefile.am
index 0521d11..fbedb98 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,6 +22,7 @@ wmaker_SOURCES = client.cclient.h
colormap.c +colormap.h cycling.c def_pixmaps.h defaults.c @@
-30,6 +31,7 @@ wmaker_SOURCES = dialog.hdock.c
dockedapp.c + dockedapp.h dock.h event.c
extend_pixmaps.h @@ -42,6 +44,7 @@ wmaker_SOURCES = icon.h
keybind.h main.c +main.h menu.c menu.h
misc.c
---
Summary of changes:
src/Makefile.am |3 +++
src/moveres.c | 12
2 files changed, 11 insertions(+), 4 deletions(-)
repo.or.cz automatic notification. Contact project admin crma...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
Problem with xfig
Hi,
I think I found the problem with xfig about icon title and border.
The problem seems to be that icon-icon_win is not NULL :-)
If we comment these lines all was fine:
---8--
if (wwin-wm_hints (wwin-wm_hints-flags IconWindowHint)) {
if (wwin-client_win == wwin-main_window) {
WApplication *wapp;
/* do not let miniwindow steal app-icon's icon window */
wapp = wApplicationOf(wwin-client_win);
// if (!wapp || wapp-app_icon == NULL)
// icon-icon_win = wwin-wm_hints-icon_window;
} else {
// icon-icon_win = wwin-wm_hints-icon_window;
}
}
---8--
These code was there, but I am not sure if we can drop it?
I tried other apps, and all was fine.
Please, help.
Best regards,
kix
--
||// //\\// Rodolfo kix Garcia
||\\// //\\ http://www.kix.es/
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
Re: Problem with xfig
On Sat, 24 Nov 2012, Rodolfo García Peñas wrote:
The problem seems to be that icon-icon_win is not NULL :-)
That's not a problem. Some apps may have an icon window instead of a
static icon (maybe they want to display something in the icon). Rather the
problem might be that it is not ignored when the ignore client supplied
icon option is set.
These code was there, but I am not sure if we can drop it?
I tried other apps, and all was fine.
Not sure either but you could try the attached test case (and check that
minimising the window is OK too as the comment suggests that it may have
something to do with that).
Regards,
BALATON Zoltan#include stdlib.h
#include stdio.h
#include X11/Xlib.h
#include X11/Xutil.h
Display *d;
Window leader, mainwin, win;
XClassHint class_hint = { wmicontest, WMIconTest };
int main(int argc, char **argv)
{
int ret;
XWMHints hints;
d = XOpenDisplay(NULL);
if ( !d )
{
fprintf(stderr,Cannot open display: %s\n, XDisplayName(NULL));
exit(EXIT_FAILURE);
}
printf(Opened display %s\n, DisplayString(d));
/* Create the leader window */
leader = XCreateSimpleWindow(d, /* Display */
DefaultRootWindow(d), /* Parent */
10, 10, /* x, y */
10, 10, /* width, height */
0, /* border_width */
BlackPixel(d, DefaultScreen(d)), /* border */
WhitePixel(d, DefaultScreen(d))); /* background */
printf(XCreateSimpleWindow returned: %lx\n, leader);
/* Create the main window */
mainwin = XCreateSimpleWindow(d, /* Display */
DefaultRootWindow(d), /* Parent */
0, 0, /* x, y */
56, 56, /* width, height */
0, /* border_width */
BlackPixel(d, DefaultScreen(d)), /* border */
WhitePixel(d, DefaultScreen(d))); /* background */
printf(XCreateSimpleWindow returned: %lx\n, mainwin);
/* Set hints */
XSetClassHint(d, leader, class_hint);
hints.flags = StateHint|WindowGroupHint|IconWindowHint;
hints.initial_state = WithdrawnState;
hints.window_group = leader;
hints.icon_window = mainwin; /* Use the main window as the icon window */
XSetWMHints(d, leader, hints);
XSetClassHint(d, mainwin, class_hint);
hints.flags = StateHint|WindowGroupHint;
hints.initial_state = NormalState;
XSetWMHints(d, mainwin, hints);
ret = XMapWindow(d, leader);
printf(XMapWindow returned: %x\n, ret);
XSync(d, False);
getchar();
/* Create a window */
win = XCreateSimpleWindow(d, /* Display */
DefaultRootWindow(d), /* Parent */
100, 100, /* x, y */
100, 100, /* width, height */
0, /* border_width */
BlackPixel(d, DefaultScreen(d)), /* border */
WhitePixel(d, DefaultScreen(d))); /* background */
printf(XCreateSimpleWindow returned: %lx\n, win);
/* Set hints */
XSetClassHint(d, win, class_hint);
XSetWMHints(d, win, hints);
ret = XMapRaised(d, win);
printf(XMapRaised returned: %x\n, ret);
XSync(d, False);
getchar();
XCloseDisplay(d);
return(EXIT_SUCCESS);
}
Re: Problem with xfig
On Sat, 24 Nov 2012, BALATON Zoltan escribió: On Sat, 24 Nov 2012, Rodolfo García Peñas wrote: The problem seems to be that icon-icon_win is not NULL :-) That's not a problem. Some apps may have an icon window instead of a static icon (maybe they want to display something in the icon). Rather the problem might be that it is not ignored when the ignore client supplied icon option is set. These code was there, but I am not sure if we can drop it? I tried other apps, and all was fine. Not sure either but you could try the attached test case (and check that minimising the window is OK too as the comment suggests that it may have something to do with that). Regards, BALATON Zoltan Hi, I am not sure if the testing application is working. The application only show a dock (miniwindow) with a white square inside. kix@osaka:~/src/wmaker/wmaker-crm/src$ /home/kix/wmicontest Opened display :1 XCreateSimpleWindow returned: 341 XCreateSimpleWindow returned: 342 XMapWindow returned: 1 If I run it with the lines commented, then the application doesn't have the white square. Regards, kix -- ||// //\\// Rodolfo kix Garcia ||\\// //\\ http://www.kix.es/ -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
