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 824255b1ae225394dc093c193082cfb7186e3eda (commit)
via a2d2f76bd03df51b099a3f0e915369d22089ae5c (commit)
from baecab089c053fa070ce962e02e599dd868dd4e5 (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/824255b1ae225394dc093c193082cfb7186e3eda
commit 824255b1ae225394dc093c193082cfb7186e3eda
Author: Christophe CURIS <[email protected]>
Date: Wed Oct 10 23:07:53 2012 +0200
Fixed incorrect attributes for XCreateWindow's attributes
The code was setting some values in the window's attribute structure
which were not being used (missing the corresponding vmask flag) and
was setting some vmask bits without setting the corresponding
value in the structure.
diff --git a/src/wcore.c b/src/wcore.c
index 1abe842..3650591 100644
--- a/src/wcore.c
+++ b/src/wcore.c
@@ -51,10 +51,9 @@ WCoreWindow *wCoreCreateTopLevel(WScreen *screen, int x, int
y, int width, int h
core = wmalloc(sizeof(WCoreWindow));
- vmask = CWBorderPixel | CWCursor | CWEventMask | CWOverrideRedirect |
CWColormap;
+ vmask = CWBackPixel | CWBorderPixel | CWCursor | CWEventMask |
CWOverrideRedirect | CWColormap;
attribs.override_redirect = True;
attribs.cursor = wCursor[WCUR_DEFAULT];
- attribs.background_pixmap = None;
attribs.background_pixel = screen->black_pixel;
attribs.border_pixel = screen->frame_border_pixel;
attribs.event_mask = SubstructureRedirectMask | ButtonPressMask |
@@ -98,9 +97,8 @@ WCoreWindow *wCoreCreate(WCoreWindow *parent, int x, int y,
int width, int heigh
core = wmalloc(sizeof(WCoreWindow));
- vmask = CWBorderPixel | CWCursor | CWEventMask | CWColormap;
+ vmask = CWBackPixel | CWCursor | CWEventMask | CWColormap;
attribs.cursor = wCursor[WCUR_DEFAULT];
- attribs.background_pixmap = None;
attribs.background_pixel = parent->screen_ptr->black_pixel;
attribs.event_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask |
ButtonReleaseMask | ButtonMotionMask |
http://repo.or.cz/w/wmaker-crm.git/commit/a2d2f76bd03df51b099a3f0e915369d22089ae5c
commit a2d2f76bd03df51b099a3f0e915369d22089ae5c
Author: Christophe CURIS <[email protected]>
Date: Tue Oct 9 01:19:15 2012 +0200
Fixed possible null pointer dereference
The new function 'unpaint_app_icon' checks its argument 'wapp' aginst NULL,
however it does dereference the pointer beforehand, which will end up in
a crash if the null-pointer case occurs.
diff --git a/src/appicon.c b/src/appicon.c
index f2dc957..9bac0ef 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -160,8 +160,8 @@ void makeAppIconFor(WApplication *wapp)
void unpaint_app_icon(WApplication *wapp)
{
WAppIcon *aicon;
- WScreen *scr = wapp->main_window_desc->screen_ptr;
- WDock *clip = scr->workspaces[scr->current_workspace]->clip;
+ WScreen *scr;
+ WDock *clip;
if (!wapp || !wapp->app_icon)
return;
@@ -172,6 +172,9 @@ void unpaint_app_icon(WApplication *wapp)
if (aicon->docked)
return;
+ scr = wapp->main_window_desc->screen_ptr;
+ clip = scr->workspaces[scr->current_workspace]->clip;
+
if (!clip || !aicon->attracted || !clip->collapsed)
XUnmapWindow(dpy, aicon->icon->core->window);
-----------------------------------------------------------------------
Summary of changes:
src/appicon.c | 7 +++++--
src/wcore.c | 6 ++----
2 files changed, 7 insertions(+), 6 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
