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
discards 9a34570fe1df853a7cf21ef16fd23ee148782234 (commit)
discards 7f8576b8d968b1eca422da20c688ad47cead1f7f (commit)
discards 6887c12c6d74a1d87bcf2cc64a77c863051ebfa5 (commit)
discards 6fa421a8b4914b6ed728e211e8d127d5eedaef6e (commit)
discards 0fe64d31b0818cc3bd1a39b98e6f54bc02562cd7 (commit)
via 8edb9dad810420e638d2c774957d1fd23ec7257e (commit)
via 46183e821542dbf24fe7aa00a03617aa82ed4135 (commit)
via c978b3fc2b16d1ebee4919112734c3e4bd8e0129 (commit)
via a13eb4e9205c8c214fe2f1c4c7be2760f4582003 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (9a34570fe1df853a7cf21ef16fd23ee148782234)
N -- N -- N (8edb9dad810420e638d2c774957d1fd23ec7257e)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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/8edb9dad810420e638d2c774957d1fd23ec7257e
commit 8edb9dad810420e638d2c774957d1fd23ec7257e
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Mon Jun 25 23:39:57 2012 +0200
Remove unused stuff from session.h
The struct WSessionData is not used and the function wSessionGetStateFor
is only defined, remove them.
diff --git a/src/session.h b/src/session.h
index 8ce14b4..4a7b9b4 100644
--- a/src/session.h
+++ b/src/session.h
@@ -22,27 +22,8 @@
#ifndef WMSESSION_H_
#define WMSESSION_H_
-
-typedef struct {
- int x;
- int y;
- unsigned int w; /* client size */
- unsigned int h;
-
- int workspace;
- unsigned shortcuts; /* mask like 1<<shortcut_number */
-
- WWindowAttributes mflags;
- WWindowAttributes flags;
-
- char miniaturized;
- char shaded;
- char maximized;
-} WSessionData;
-
void wSessionSaveState(WScreen *scr);
void wSessionClearState(WScreen *scr);
void wSessionRestoreState(WScreen *scr);
void wSessionRestoreLastWorkspace(WScreen *scr);
-Bool wSessionGetStateFor(WWindow *wwin, WSessionData *state);
#endif
http://repo.or.cz/w/wmaker-crm.git/commit/46183e821542dbf24fe7aa00a03617aa82ed4135
commit 46183e821542dbf24fe7aa00a03617aa82ed4135
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Mon Jun 25 23:06:31 2012 +0200
window.h: Remove unused variables from WWindow struct
The variables waiting_save_ack, dragged_while_fmaximized,
buttons_dont_fit, rebuild_texture and needs_full_repaint are not used,
so they can be removed.
diff --git a/src/window.h b/src/window.h
index dfe53b6..99e1c24 100644
--- a/src/window.h
+++ b/src/window.h
@@ -264,11 +264,6 @@ typedef struct WWindow {
app */
unsigned int is_dockapp:1; /* 1 if the window belongs to a DockApp */
- unsigned int buttons_dont_fit:1;
- unsigned int rebuild_texture:1; /* the window was resized and
- * gradients should be re-rendered */
- unsigned int needs_full_repaint:1;/* does a full repaint of the
- * window next time it's painted */
unsigned int icon_moved:1; /* icon for this window was moved
* by the user */
unsigned int selected:1; /* multiple window selection */
@@ -279,15 +274,9 @@ typedef struct WWindow {
unsigned int inspector_open:1; /* attrib inspector is already open */
unsigned int destroyed:1; /* window was already destroyed */
-
unsigned int menu_open_for_me:1; /* window commands menu */
-
- unsigned int waiting_save_ack:1; /* waiting for SAVE_YOURSELF ack */
-
unsigned int obscured:1; /* window is obscured */
- unsigned int dragged_while_fmaximized;
-
unsigned int net_skip_pager:1;
unsigned int net_handle_icon:1;
unsigned int net_show_desktop:1;
@@ -337,7 +326,6 @@ typedef struct WSavedState {
unsigned window_shortcuts; /* mask like 1<<shortcut_number */
} WSavedState;
-
typedef struct WWindowState {
char *instance;
char *class;
@@ -347,11 +335,8 @@ typedef struct WWindowState {
struct WWindowState *next;
} WWindowState;
-
typedef void* WMagicNumber;
-
-
void wWindowDestroy(WWindow *wwin);
WWindow *wWindowCreate(void);
@@ -417,5 +402,4 @@ void wWindowDeleteSavedState(WMagicNumber id);
Bool wWindowObscuresWindow(WWindow *wwin, WWindow *obscured);
void wWindowSetOmnipresent(WWindow *wwin, Bool flag);
-
#endif
http://repo.or.cz/w/wmaker-crm.git/commit/c978b3fc2b16d1ebee4919112734c3e4bd8e0129
commit c978b3fc2b16d1ebee4919112734c3e4bd8e0129
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Mon Jun 25 21:56:19 2012 +0200
Variables user_changed_* can be removed
The variables user_changed_ are set but their values are not checked/used
in the code, so they can be removed.
diff --git a/src/moveres.c b/src/moveres.c
index 6563258..3d3ff7e 100644
--- a/src/moveres.c
+++ b/src/moveres.c
@@ -1471,7 +1471,6 @@ int wKeyboardMoveResizeWindow(WWindow * wwin)
if (opaqueMoveResize) {
XUngrabServer(dpy);
- wwin->flags.user_changed_width = 1;
wWindowConfigure(wwin, src_x + off_x,
src_y + off_y, ww, wh - vert_border);
};
@@ -1518,15 +1517,11 @@ int wKeyboardMoveResizeWindow(WWindow * wwin)
}
}
} else {
- if (wwin->client.width != ww) {
- wwin->flags.user_changed_width
= 1;
+ if (wwin->client.width != ww)
wwin->flags.maximized &=
~(MAX_HORIZONTAL | MAX_MAXIMUS);
- }
- if (wwin->client.height != wh -
vert_border) {
- wwin->flags.user_changed_height
= 1;
+ if (wwin->client.height != wh -
vert_border)
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);
wWindowSynthConfigureNotify(wwin);
@@ -2047,7 +2042,6 @@ void wMouseResizeWindow(WWindow * wwin, XEvent * ev)
showGeometry(wwin, fx, fy, fx + fw, fy
+ fh, res);
/* Now, continue drawing */
XUngrabServer(dpy);
- wwin->flags.user_changed_width = 1;
moveGeometryDisplayCentered(scr, fx +
fw / 2, fy + fh / 2);
wWindowConfigure(wwin, fx, fy, fw, fh -
vert_border);
showGeometry(wwin, fx, fy, fx + fw, fy
+ fh, res);
@@ -2072,15 +2066,11 @@ void wMouseResizeWindow(WWindow * wwin, XEvent * ev)
WMUnmapWidget(scr->gview);
XUngrabServer(dpy);
- if (wwin->client.width != fw) {
- wwin->flags.user_changed_width = 1;
+ if (wwin->client.width != fw)
wwin->flags.maximized &=
~(MAX_HORIZONTAL | MAX_MAXIMUS);
- }
- if (wwin->client.height != fh - vert_border) {
- wwin->flags.user_changed_height = 1;
+ if (wwin->client.height != fh - vert_border)
wwin->flags.maximized &= ~(MAX_VERTICAL
| MAX_LEFTHALF | MAX_RIGHTHALF | MAX_MAXIMUS);
- }
wWindowConfigure(wwin, fx, fy, fw, fh -
vert_border);
wWindowSynthConfigureNotify(wwin);
diff --git a/src/window.h b/src/window.h
index ae1e704..dfe53b6 100644
--- a/src/window.h
+++ b/src/window.h
@@ -288,8 +288,6 @@ typedef struct WWindow {
unsigned int dragged_while_fmaximized;
- unsigned int user_changed_width:1;
- unsigned int user_changed_height:1;
unsigned int net_skip_pager:1;
unsigned int net_handle_icon:1;
unsigned int net_show_desktop:1;
http://repo.or.cz/w/wmaker-crm.git/commit/a13eb4e9205c8c214fe2f1c4c7be2760f4582003
commit a13eb4e9205c8c214fe2f1c4c7be2760f4582003
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Mon Jun 25 21:53:23 2012 +0200
Remove never-set variable net_state_from_client
Even though net_state_from_client was never being set, it was
being tested inside a
if (!wwin->flags.net_state_from_client)
which according to testing was always being true (probably because gcc
initializes it to zero). But this situation is confusing, so it's
better to remove the if() test altogether as that is the intention
if net_state_from_client is not explicitly set (which it isn't in
the current wmaker source).
This situation is analogous to:
[mafra@Pilar:c]$ cat init.c
int main(void)
{
int a;
if (!a)
printf("No a = %dn", a);
return 0;
}
[mafra@Pilar:c]$ ./init
No a = 0
diff --git a/src/window.h b/src/window.h
index e2d516a..ae1e704 100644
--- a/src/window.h
+++ b/src/window.h
@@ -290,7 +290,6 @@ typedef struct WWindow {
unsigned int user_changed_width:1;
unsigned int user_changed_height:1;
- unsigned int net_state_from_client:1; /* state hint was set by client
*/
unsigned int net_skip_pager:1;
unsigned int net_handle_icon:1;
unsigned int net_show_desktop:1;
diff --git a/src/wmspec.c b/src/wmspec.c
index 9456841..ae870ea 100644
--- a/src/wmspec.c
+++ b/src/wmspec.c
@@ -795,9 +795,7 @@ static void updateWorkspaceHint(WWindow * wwin, Bool fake,
Bool del)
static void updateStateHint(WWindow * wwin, Bool changedWorkspace, Bool del)
{ /* changeable */
if (del) {
- if (!wwin->flags.net_state_from_client) {
- XDeleteProperty(dpy, wwin->client_win, net_wm_state);
- }
+ XDeleteProperty(dpy, wwin->client_win, net_wm_state);
} else {
Atom state[15]; /* nr of defined state atoms */
int i = 0;
-----------------------------------------------------------------------
Summary of changes:
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].
