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 0e671d36834ed3473d87dd7fc3b387ad6ae7d179 (commit)
via 6110610f5ec05cd9122d2e71aa511a7bec2991bf (commit)
from cd7edbcc11a8b180dccdd584106c87736f9bcb3b (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/0e671d36834ed3473d87dd7fc3b387ad6ae7d179
commit 0e671d36834ed3473d87dd7fc3b387ad6ae7d179
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Sat Jun 23 12:19:31 2012 +0200
icon.c code cleanup
diff --git a/src/icon.c b/src/icon.c
index a270a35..fd9bb11 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -69,16 +69,8 @@ static void appearanceObserver(void *self, WMNotification *
notif)
WIcon *icon = (WIcon *) self;
uintptr_t flags = (uintptr_t)WMGetNotificationClientData(notif);
- if (flags & WTextureSettings) {
+ if ((flags & WTextureSettings) || (flags & WFontSettings))
icon->force_paint = 1;
- }
- if (flags & WFontSettings) {
- icon->force_paint = 1;
- }
- /*
- if (flags & WColorSettings) {
- }
- */
wIconPaint(icon);
@@ -164,9 +156,8 @@ WIcon *wIconCreateWithIconFile(WScreen * scr, char
*iconfile, int tile)
if (iconfile) {
icon->file_image = RLoadImage(scr->rcontext, iconfile, 0);
- if (!icon->file_image) {
+ if (!icon->file_image)
wwarning(_("error loading image file "%s": %s"),
iconfile, RMessageForError(RErrorCode));
- }
icon->file_image = wIconValidateIconSize(scr, icon->file_image,
wPreferences.icon_size);
@@ -638,7 +629,6 @@ void get_pixmap_icon_from_user_icon(WScreen *scr, WIcon *
icon)
} else {
wwarning(_("could not find default icon
"%s""), file);
}
- /* FIXME: Probably wfree(file) here! */
}
image = wIconValidateIconSize(scr, image,
wPreferences.icon_size);
@@ -725,7 +715,7 @@ int get_pixmap_icon_from_wm_hints(WScreen *scr, WWindow
*wwin, WIcon *icon)
if (!XGetGeometry(dpy, wwin->wm_hints->icon_pixmap, &jw, &ji, &ji, &w,
&h, &ju, &d)) {
icon->owner->wm_hints->flags &= ~IconPixmapHint;
- return(1);
+ return 1;
}
pixmap = XCreatePixmap(dpy, icon->core->window, wPreferences.icon_size,
http://repo.or.cz/w/wmaker-crm.git/commit/6110610f5ec05cd9122d2e71aa511a7bec2991bf
commit 6110610f5ec05cd9122d2e71aa511a7bec2991bf
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Sat Jun 23 11:42:26 2012 +0200
Cleanup superfluous.c a bit
The superfluous.[ch] files have a few minor issues, this patch addresses
some of them:
- Move the defines to the top of the superfluous.c file
- Include the ifdef NORMAL_ICON_KABOOM inside the DoKaboom() function
because the DoKaboom is used without the NORMAL_ICON_KABOOM ifdef in
other files.
- Include the ifdef WINDOW_BIRTH_ZOOM inside the DoWindowBirth() function,
therefore the function don't needs to be defined twice (with and whitout
WINDOW_BIRTH_ZOOM define.
- Now the functions are defined in superfluous.h and the externs are not
needed.
- We need include the dock.h in the superflous.h because is used by the
definition of MakeGhostDock().
- We need include the superfluous.h in window.c (removing the extern)
diff --git a/src/superfluous.c b/src/superfluous.c
index 78679ae..135ce42 100644
--- a/src/superfluous.c
+++ b/src/superfluous.c
@@ -33,7 +33,6 @@
#include "WindowMaker.h"
#include "screen.h"
-#include "dock.h"
#include "superfluous.h"
#include "framewin.h"
#include "window.h"
@@ -41,14 +40,22 @@
#include "xinerama.h"
#include "stacking.h"
+#define PIECES ((64/ICON_KABOOM_PIECE_SIZE)*(64/ICON_KABOOM_PIECE_SIZE))
+#define KAB_PRECISION 4
+#define BOUNCE_HZ 25
+#define BOUNCE_DELAY (1000/BOUNCE_HZ)
+#define BOUNCE_HEIGHT 24
+#define BOUNCE_LENGTH 0.3
+#define BOUNCE_DAMP 0.6
+#define URGENT_BOUNCE_DELAY 3000
+
extern WPreferences wPreferences;
-#ifdef NORMAL_ICON_KABOOM
void DoKaboom(WScreen * scr, Window win, int x, int y)
{
+#ifdef NORMAL_ICON_KABOOM
int i, j, k;
int sw = scr->scr_width, sh = scr->scr_height;
-#define KAB_PRECISION 4
int px[PIECES];
short py[PIECES];
char pvx[PIECES], pvy[PIECES];
@@ -127,8 +134,8 @@ void DoKaboom(WScreen * scr, Window win, int x, int y)
}
XFreePixmap(dpy, tmp);
-}
#endif /* NORMAL_ICON_KABOOM */
+}
Pixmap MakeGhostDock(WDock * dock, int sx, int dx, int y)
{
@@ -230,10 +237,9 @@ Pixmap MakeGhostIcon(WScreen * scr, Drawable drawable)
return pixmap;
}
-#ifdef WINDOW_BIRTH_ZOOM
-
void DoWindowBirth(WWindow *wwin)
{
+#ifdef WINDOW_BIRTH_ZOOM
int center_x, center_y;
int width = wwin->frame->core->width;
int height = wwin->frame->core->height;
@@ -245,20 +251,8 @@ void DoWindowBirth(WWindow *wwin)
center_y = wwin->frame_y + (height - h) / 2;
animateResize(scr, center_x, center_y, 1, 1, wwin->frame_x,
wwin->frame_y, width, height);
-}
-#else
-void DoWindowBirth(WWindow *wwin)
-{
- /* dummy stub */
-}
#endif
-
-#define BOUNCE_HZ 25
-#define BOUNCE_DELAY (1000/BOUNCE_HZ)
-#define BOUNCE_HEIGHT 24
-#define BOUNCE_LENGTH 0.3
-#define BOUNCE_DAMP 0.6
-#define URGENT_BOUNCE_DELAY 3000
+}
typedef struct AppBouncerData {
WApplication *wapp;
diff --git a/src/superfluous.h b/src/superfluous.h
index 8811843..b7b70b1 100644
--- a/src/superfluous.h
+++ b/src/superfluous.h
@@ -21,9 +21,10 @@
#ifndef WMSUPERFLUOUS_H
#define WMSUPERFLUOUS_H
-#define PIECES ((64/ICON_KABOOM_PIECE_SIZE)*(64/ICON_KABOOM_PIECE_SIZE))
+#include "dock.h"
-extern void DoKaboom(WScreen *scr, Window win, int x, int y);
-extern Pixmap MakeGhostDock(WDock *dock, int sx, int dx, int y);
-extern Pixmap MakeGhostIcon(WScreen *scr, Drawable drawable);
-#endif /* WMSUPERFLUOUS_H */
+void DoKaboom(WScreen *scr, Window win, int x, int y);
+Pixmap MakeGhostDock(WDock *dock, int sx, int dx, int y);
+Pixmap MakeGhostIcon(WScreen *scr, Drawable drawable);
+void DoWindowBirth(WWindow *wwin);
+#endif
diff --git a/src/window.c b/src/window.c
index b3802eb..91ad63f 100644
--- a/src/window.c
+++ b/src/window.c
@@ -57,6 +57,7 @@
#include "xinerama.h"
#include "appmenu.h"
#include "appicon.h"
+#include "superfluous.h"
#ifdef MWM_HINTS
# include "motif.h"
@@ -82,9 +83,6 @@ extern Atom _XA_WINDOWMAKER_STATE;
extern WPreferences wPreferences;
extern Time LastTimestamp;
-/* superfluous... */
-extern void DoWindowBirth(WWindow *wwin);
-
/***** Local Stuff *****/
static WWindowState *windowState = NULL;
static FocusMode getFocusMode(WWindow *wwin);
-----------------------------------------------------------------------
Summary of changes:
src/icon.c | 16 +++-------------
src/superfluous.c | 32 +++++++++++++-------------------
src/superfluous.h | 11 ++++++-----
src/window.c | 4 +---
4 files changed, 23 insertions(+), 40 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].
