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 e393c6b61a5b3b7792e85b9092798e7bdd1e184d (commit)
via db6605932bb1d7ef547690229c3f3040263e53d8 (commit)
via 4111f336d03ce344ca4b2828b8c370b484c85341 (commit)
from 8b6e96ab74548106fe86ccf298f5949b992d3f4c (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/e393c6b61a5b3b7792e85b9092798e7bdd1e184d
commit e393c6b61a5b3b7792e85b9092798e7bdd1e184d
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Sun Nov 18 23:07:50 2012 +0100
stacking.h removed white lines
The white lines in stacking.h were removed.
diff --git a/src/stacking.h b/src/stacking.h
index de333e1..574ed74 100644
--- a/src/stacking.h
+++ b/src/stacking.h
@@ -20,29 +20,16 @@
#ifndef WMSTACKING_H_
#define WMSTACKING_H_
-
void wRaiseFrame(WCoreWindow *frame);
-
void wLowerFrame(WCoreWindow *frame);
-
void wRaiseLowerFrame(WCoreWindow *frame);
-
void AddToStackList(WCoreWindow *frame);
-
void MoveInStackListAbove(WCoreWindow *next, WCoreWindow *frame);
-
void MoveInStackListUnder(WCoreWindow *prev, WCoreWindow *frame);
-
void RemoveFromStackList(WCoreWindow *frame);
-
void ChangeStackingLevel(WCoreWindow *frame, int new_level);
-
void RemakeStackList(WScreen *scr);
-
void CommitStacking(WScreen *scr);
-
void CommitStackingForFrame(WCoreWindow *frame);
-
void CommitStackingForWindow(WCoreWindow * frame);
-
#endif
http://repo.or.cz/w/wmaker-crm.git/commit/db6605932bb1d7ef547690229c3f3040263e53d8
commit db6605932bb1d7ef547690229c3f3040263e53d8
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Sun Nov 18 23:07:47 2012 +0100
window.c clean code 1
This patch only make some code style clean.
diff --git a/src/window.c b/src/window.c
index 7f12c65..1cb384a 100644
--- a/src/window.c
+++ b/src/window.c
@@ -596,6 +596,7 @@ WWindow *wManageWindow(WScreen *scr, Window window)
/* mutex. */
XGrabServer(dpy);
XSync(dpy, False);
+
/* make sure the window is still there */
if (!XGetWindowAttributes(dpy, window, &wattribs)) {
XUngrabServer(dpy);
@@ -621,7 +622,7 @@ WWindow *wManageWindow(WScreen *scr, Window window)
title = wNETWMGetWindowName(window);
if (title)
wwin->flags.net_has_title = 1;
- if (!title && !wFetchName(dpy, window, &title))
+ else if (!wFetchName(dpy, window, &title))
title = NULL;
XSaveContext(dpy, window, wWinContext, (XPointer) &
wwin->client_descriptor);
@@ -639,9 +640,7 @@ WWindow *wManageWindow(WScreen *scr, Window window)
}
#endif
- /*
- * Get hints and other information in properties
- */
+ /* Get hints and other information in properties */
PropGetWMClass(window, &wwin->wm_class, &wwin->wm_instance);
/* setup descriptor */
@@ -676,7 +675,6 @@ WWindow *wManageWindow(WScreen *scr, Window window)
if (wwin->wm_hints) {
if (wwin->wm_hints->flags & StateHint) {
-
if (wwin->wm_hints->initial_state == IconicState) {
wwin->flags.miniaturized = 1;
} else if (wwin->wm_hints->initial_state ==
WithdrawnState) {
@@ -784,7 +782,6 @@ WWindow *wManageWindow(WScreen *scr, Window window)
}
}
wwin->fake_group = fPtr;
- /*wwin->group_id = fPtr->leader; */
wwin->main_window = fPtr->leader;
wfree(buffer);
} else {
@@ -802,11 +799,12 @@ WWindow *wManageWindow(WScreen *scr, Window window)
fPtr->origLeader = wwin->main_window;
}
wwin->fake_group = fPtr;
- /*wwin->group_id = fPtr->leader; */
wwin->main_window = fPtr->leader;
}
+
if (instance)
free(instance);
+
if (class)
free(class);
#undef ADEQUATE
@@ -825,11 +823,10 @@ WWindow *wManageWindow(WScreen *scr, Window window)
/* apply previous state if it exists and we're in startup */
if (scr->flags.startup && wm_state >= 0) {
- if (wm_state == IconicState) {
+ if (wm_state == IconicState)
wwin->flags.miniaturized = 1;
- } else if (wm_state == WithdrawnState) {
+ else if (wm_state == WithdrawnState)
withdraw = True;
- }
}
/* if there is a saved state (from file), restore it */
@@ -909,6 +906,7 @@ WWindow *wManageWindow(WScreen *scr, Window window)
}
}
}
+
if (wstate != NULL)
wfree(wstate);
}
@@ -944,6 +942,7 @@ WWindow *wManageWindow(WScreen *scr, Window window)
width = win_state->state->w;
height = win_state->state->h;
}
+
wWindowConstrainSize(wwin, &width, &height);
/* do not ask for window placement if the window is
@@ -972,9 +971,7 @@ WWindow *wManageWindow(WScreen *scr, Window window)
y = transientOwner->frame_y +
abs((transientOwner->frame->core->height -
height) / 3) + offs;
- /*
- * limit transient windows to be inside their
parent's head
- */
+ /* limit transient windows to be inside their
parent's head */
rect.pos.x = transientOwner->frame_x;
rect.pos.y = transientOwner->frame_y;
rect.size.width =
transientOwner->frame->core->width;
@@ -997,28 +994,25 @@ WWindow *wManageWindow(WScreen *scr, Window window)
PlaceWindow(wwin, &x, &y, width, height);
frame_adjustment = False;
}
- if (wPreferences.window_placement == WPM_MANUAL) {
+
+ if (wPreferences.window_placement == WPM_MANUAL)
dontBring = True;
- }
+
} else if (scr->xine_info.count && (wwin->normal_hints->flags &
PPosition)) {
int head, flags;
WMRect rect;
int reposition = 0;
- /*
- * Make spash screens come out in the center of a head
+ /* Make spash screens come out in the center of a head
* trouble is that most splashies never get here
* they are managed trough atoms but god knows where.
* Dan, do you know ? -peter
*
* Most of them are not managed, they have set
* OverrideRedirect, which means we can't do anything
about
- * them. -alfredo
- */
+ * them. -alfredo */
{
- /*
- * xinerama checks for: across head and dead
space
- */
+ /* xinerama checks for: across head and dead
space */
rect.pos.x = x;
rect.pos.y = y;
rect.size.width = width;
@@ -1073,9 +1067,7 @@ WWindow *wManageWindow(WScreen *scr, Window window)
wwin->flags.omnipresent ^= 1;
}
- /*
- * Create frame, borders and do reparenting
- */
+ /* Create frame, borders and do reparenting */
foo = WFF_LEFT_BUTTON | WFF_RIGHT_BUTTON;
#ifdef XKB_BUTTON_HINT
if (wPreferences.modelock)
@@ -1083,8 +1075,10 @@ WWindow *wManageWindow(WScreen *scr, Window window)
#endif
if (HAS_TITLEBAR(wwin))
foo |= WFF_TITLEBAR;
+
if (HAS_RESIZEBAR(wwin))
foo |= WFF_RESIZEBAR;
+
if (HAS_BORDER(wwin))
foo |= WFF_BORDER;
@@ -1108,8 +1102,10 @@ WWindow *wManageWindow(WScreen *scr, Window window)
foo = 0;
if (WFLAGP(wwin, no_close_button))
foo |= WFF_RIGHT_BUTTON;
+
if (WFLAGP(wwin, no_miniaturize_button))
foo |= WFF_LEFT_BUTTON;
+
#ifdef XKB_BUTTON_HINT
if (WFLAGP(wwin, no_language_button) || WFLAGP(wwin, no_focusable))
foo |= WFF_LANGUAGE_BUTTON;
@@ -1161,15 +1157,13 @@ WWindow *wManageWindow(WScreen *scr, Window window)
/* wWindowConfigure() will account for the frame
* when placing so the window would be shifted without
- * the adjustment below
- */
+ * the adjustment below */
if (y >= usableArea.y1 + wwin->frame->top_width)
y -= wwin->frame->top_width;
/* wWindowConfigure() will account for the window border
* when placing so the window would be shifted without
- * the adjustment below
- */
+ * the adjustment below */
if (HAS_BORDER(wwin)) {
if (x >= usableArea.x1 + FRAME_BORDER_WIDTH)
x -= FRAME_BORDER_WIDTH;
@@ -1184,25 +1178,19 @@ WWindow *wManageWindow(WScreen *scr, Window window)
* the absolute co-ordinates of the client window, offset
* by the title bar and frame border. As a result
* we need to offset placement of the client by the border
- * size so its position matches what we expect.
- */
+ * size so its position matches what we expect. */
x += wwin->old_border_width;
y += wwin->old_border_width;
- /*
- * wWindowConfigure() will init the client window's size
+ /* wWindowConfigure() will init the client window's size
* (wwin->client.{width,height}) and all other geometry
- * related variables (frame_x,frame_y)
- */
+ * related variables (frame_x,frame_y) */
wWindowConfigure(wwin, x, y, width, height);
/* to make sure the window receives it's new position after reparenting
*/
wWindowSynthConfigureNotify(wwin);
- /*
- * Setup descriptors and save window to internal
- * lists
- */
+ /* Setup descriptors and save window to internal lists */
if (wwin->main_window != None) {
WApplication *app;
WWindow *leader;
@@ -1218,10 +1206,8 @@ WWindow *wManageWindow(WScreen *scr, Window window)
if (app) {
app->last_workspace = workspace;
- /*
- * Do application specific stuff, like setting
application
- * wide attributes.
- */
+ /* Do application specific stuff, like setting
application
+ * wide attributes. */
if (wwin->flags.hidden) {
/* if the window was set to hidden because it
was hidden
@@ -1255,8 +1241,7 @@ WWindow *wManageWindow(WScreen *scr, Window window)
/* The following "if" is to avoid crashing of clients that
expect
* WM_STATE set before they get mapped. Else WM_STATE is set
later,
- * after the return from this function.
- */
+ * after the return from this function. */
if (wwin->wm_hints && (wwin->wm_hints->flags & StateHint))
wClientSetState(wwin, wwin->wm_hints->initial_state,
None);
else
@@ -1304,6 +1289,7 @@ WWindow *wManageWindow(WScreen *scr, Window window)
tmp = scr->focused_window;
while (tmp->prev)
tmp = tmp->prev;
+
tmp->prev = wwin;
wwin->next = tmp;
wwin->prev = NULL;
@@ -1321,9 +1307,7 @@ WWindow *wManageWindow(WScreen *scr, Window window)
XUngrabServer(dpy);
- /*
- * Final preparations before window is ready to go
- */
+ /* Final preparations before window is ready to go */
wFrameWindowChangeState(wwin->frame, WS_UNFOCUSED);
if (!wwin->flags.miniaturized && workspace == scr->current_workspace &&
!wwin->flags.hidden) {
http://repo.or.cz/w/wmaker-crm.git/commit/4111f336d03ce344ca4b2828b8c370b484c85341
commit 4111f336d03ce344ca4b2828b8c370b484c85341
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Sun Nov 18 23:07:46 2012 +0100
create_stdcmap is never used
The create_stdcmap variable is never set, so can be removed.
This patch don't update the translation .po files!
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index ca89299..afc2871 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -439,7 +439,6 @@ typedef struct WPreferences {
unsigned int noupdates:1; /* don't require ~/GNUstep (-static) */
unsigned int noautolaunch:1; /* don't autolaunch apps */
unsigned int norestore:1; /* don't restore session */
- unsigned int create_stdcmap:1; /* create std colormap */
#ifndef HAVE_INOTIFY
unsigned int nopolling:1; /* don't poll the defaults database for
changes */
#endif
diff --git a/src/main.c b/src/main.c
index f492ac6..b09b6ef 100644
--- a/src/main.c
+++ b/src/main.c
@@ -498,7 +498,6 @@ static void print_help(void)
puts(_(" --locale locale locale to use"));
- puts(_(" --create-stdcmap create the standard colormap hint in
PseudoColor visuals"));
puts(_(" --visual-id visualid visual id of visual to use"));
puts(_(" --static do not update or save configurations"));
#ifndef HAVE_INOTIFY
diff --git a/src/screen.c b/src/screen.c
index 1ba325c..ecdb498 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -596,12 +596,8 @@ WScreen *wScreenInit(int screen_number)
if (rattr.colors_per_channel < 2)
rattr.colors_per_channel = 2;
- /* will only be accounted for in PseudoColor */
- if (wPreferences.flags.create_stdcmap) {
- rattr.standard_colormap_mode = RCreateStdColormap;
- } else {
- rattr.standard_colormap_mode = RUseStdColormap;
- }
+ /* Use standard colormap */
+ rattr.standard_colormap_mode = RUseStdColormap;
if (getWVisualID(screen_number) >= 0) {
rattr.flags |= RC_VisualID;
-----------------------------------------------------------------------
Summary of changes:
src/WindowMaker.h | 1 -
src/main.c | 1 -
src/screen.c | 8 +----
src/stacking.h | 13 --------
src/window.c | 80 +++++++++++++++++++++-------------------------------
5 files changed, 34 insertions(+), 69 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].
