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 e51598bbf557dccdd9d8325fd6d150d69a518bc2 (commit)
discards 126076811d63be4a29633b8e20079326830db9e4 (commit)
discards eb46e503ddcd3e41c317d418c053312036e064a1 (commit)
via cae3be1e9cf07d5321d0a2e98ea0fd3556e1454d (commit)
via d9b10080dbb2e4ca3466efb411080b7cb11e2224 (commit)
via 025075d5f0366810e91676f4cc9195c3770f94f4 (commit)
via 61118ffa40979a45e6c75056bc81d133ad8cfdd5 (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 (e51598bbf557dccdd9d8325fd6d150d69a518bc2)
N -- N -- N (cae3be1e9cf07d5321d0a2e98ea0fd3556e1454d)
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/cae3be1e9cf07d5321d0a2e98ea0fd3556e1454d
commit cae3be1e9cf07d5321d0a2e98ea0fd3556e1454d
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Sun Feb 12 20:04:50 2012 +0100
menu: remove OpenWorkspaceMenu()
The function OpenWorkspaceMenu() is not used, remove it.
diff --git a/src/funcs.h b/src/funcs.h
index 5d813ea..6d2c552 100644
--- a/src/funcs.h
+++ b/src/funcs.h
@@ -61,8 +61,6 @@ void OpenWindowMenu2(WWindow *wwin, int x, int y, int
keyboard);
void OpenMiniwindowMenu(WWindow *wwin, int x, int y);
-void OpenWorkspaceMenu(WScreen *scr, int x, int y);
-
void CloseWindowMenu(WScreen *scr);
void DestroyWindowMenu(WScreen *scr);
diff --git a/src/menu.c b/src/menu.c
index 5286899..449904f 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -2503,36 +2503,3 @@ void wMenuRestoreState(WScreen * scr)
}
restoreMenuRecurs(scr, menus, scr->root_menu, "");
}
-
-void OpenWorkspaceMenu(WScreen * scr, int x, int y)
-{
- WMenu *menu, *parent;
- WMenuEntry *entry;
-
- if (!scr->root_menu) {
- OpenRootMenu(scr, scr->scr_width * 2, 0, False);
- wMenuUnmap(scr->root_menu);
- }
-
- menu = scr->workspace_menu;
- if (menu) {
- if (menu->flags.mapped) {
- if (!menu->flags.buttoned) {
- wMenuUnmap(menu);
- parent = menu->parent;
- if (parent && parent->selected_entry >= 0) {
- entry =
parent->entries[parent->selected_entry];
- if (parent->cascades[entry->cascade] ==
menu) {
- selectEntry(parent, -1);
- wMenuMapAt(menu, x, y, False);
- }
- }
- } else {
- wRaiseFrame(menu->frame->core);
- wMenuMapCopyAt(menu, x, y);
- }
- } else {
- wMenuMapAt(menu, x, y, False);
- }
- }
-}
http://repo.or.cz/w/wmaker-crm.git/commit/d9b10080dbb2e4ca3466efb411080b7cb11e2224
commit d9b10080dbb2e4ca3466efb411080b7cb11e2224
Author: Carlos R. Mafra <[email protected]>
Date: Sun Feb 12 17:09:19 2012 +0000
wmgenmenu: Update mrxvt options
The old mrxvt I had in my previous distro is gone. The options
need to be updated.
diff --git a/util/wmgenmenu.h b/util/wmgenmenu.h
index dddd433..ab2cd8a 100644
--- a/util/wmgenmenu.h
+++ b/util/wmgenmenu.h
@@ -7,7 +7,7 @@
char *Terminals[MAX_NR_APPS][2] = {
{ N_("xterm"), "xterm -bg black -fg white +sb +sm -fn 10x20 -sl 4000
-cr yellow" },
- { N_("mrxvt"), "mrxvt -rv -shade 00 -vb +sb +sm -tr -sl 2000 -trt
-itabbg black -hb -tabfg yellow -fn 10x20 -cr yellow" },
+ { N_("mrxvt"), "mrxvt +bt +bc -shade 00 -vb +sb +sm -tr -sl 2000 -trt
-itabbg black -hb -tabfg yellow -fn 10x20 -cr yellow" },
{ N_("Konsole"), "konsole" },
{ N_("Urxvt"), "urxvt" },
{ NULL, NULL }
http://repo.or.cz/w/wmaker-crm.git/commit/025075d5f0366810e91676f4cc9195c3770f94f4
commit 025075d5f0366810e91676f4cc9195c3770f94f4
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Sun Feb 12 16:08:51 2012 +0100
WindowMaker: Add Balloon to the clip
Display a standard Window Maker balloon with the workspace name when the
mouse enters the clip area.
This complements commit 2dae36b1961a ("clip: Do not display balloon with
workspace name") because now the balloon which appears on the clip is the
same as in other parts of wmaker.
diff --git a/src/balloon.c b/src/balloon.c
index a4e8aaf..517dc92 100644
--- a/src/balloon.c
+++ b/src/balloon.c
@@ -439,7 +439,15 @@ static void appiconBalloon(WObjDescriptor * object)
WScreen *scr = aicon->icon->core->screen_ptr;
char *tmp;
- if (aicon->command && aicon->wm_class) {
+ /* Show balloon if it is the Clip and the workspace name is > 5 chars */
+ if (object->parent == scr->clip_icon) {
+ if (strlen(scr->workspaces[scr->current_workspace]->name) > 5) {
+ scr->balloon->text =
wstrdup(scr->workspaces[scr->current_workspace]->name);
+ } else {
+ wBalloonHide(scr);
+ return;
+ }
+ } else if (aicon->command && aicon->wm_class) {
int len = strlen(aicon->command) + strlen(aicon->wm_class) + 8;
tmp = wmalloc(len);
snprintf(tmp, len, "%sn(%s)", aicon->wm_class, aicon->command);
@@ -510,24 +518,19 @@ void wBalloonEnteredObject(WScreen * scr, WObjDescriptor
* object)
balloon->ignoreTimer = 0;
return;
}
+
switch (object->parent_type) {
case WCLASS_FRAME:
- if (wPreferences.window_balloon) {
+ if (wPreferences.window_balloon)
frameBalloon(object);
- }
break;
-
case WCLASS_DOCK_ICON:
- if (object->parent != scr->clip_icon &&
wPreferences.appicon_balloon)
+ if (wPreferences.appicon_balloon)
appiconBalloon(object);
- else
- wBalloonHide(scr);
break;
-
case WCLASS_MINIWINDOW:
- if (wPreferences.miniwin_balloon) {
+ if (wPreferences.miniwin_balloon)
miniwindowBalloon(object);
- }
break;
case WCLASS_APPICON:
if (wPreferences.appicon_balloon)
http://repo.or.cz/w/wmaker-crm.git/commit/61118ffa40979a45e6c75056bc81d133ad8cfdd5
commit 61118ffa40979a45e6c75056bc81d133ad8cfdd5
Author: Carlos R. Mafra <[email protected]>
Date: Sat Feb 11 20:44:28 2012 +0000
clip: Do not display balloon with workspace name
When the mouse passes over the clip, wmaker would display a "odd" balloon
text with the workspace name, but the balloon itself was covered by the
clip icon!
So if the workspace name was short enough ("Internet" is, by my testing
here)
the user wouldn't see anything, the balloon is completely under the clip
icon.
I found this issue because one of my workspaces is called "Beyonder" and I
noticed a small "r" under the clip one day.
Instead of trying to fix this, I just removed the whole thing about
displaying
the balloon because it is superfluous and I haven't seen any bug reports
about
this yet, so it probably means most people are not even aware of it.
Signed-off-by: Carlos R. Mafra <[email protected]>
diff --git a/src/dock.c b/src/dock.c
index 0928320..227172b 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -119,7 +119,6 @@ static void launchDockedApplication(WAppIcon * btn, Bool
withSelection);
static void clipAutoLower(void *cdata);
static void clipAutoRaise(void *cdata);
-static void showClipBalloon(WDock * dock, int workspace);
static void make_keys(void)
{
@@ -3002,8 +3001,6 @@ void wClipUpdateForWorkspaceChange(WScreen * scr, int
workspace)
}
wDockShowIcons(scr->workspaces[workspace]->clip);
}
- if (scr->flags.clip_balloon_mapped)
- showClipBalloon(scr->clip_icon->dock, workspace);
}
}
@@ -3747,10 +3744,6 @@ static void iconMouseDown(WObjDescriptor * desc, XEvent
* event)
}
}
- if (dock->type == WM_CLIP && scr->flags.clip_balloon_mapped) {
- XUnmapWindow(dpy, scr->clip_balloon);
- scr->flags.clip_balloon_mapped = 0;
- }
if (event->xbutton.button == Button1) {
if (event->xbutton.state & MOD_MASK)
wDockLower(dock);
@@ -3817,45 +3810,6 @@ static void iconMouseDown(WObjDescriptor * desc, XEvent
* event)
}
}
-static void showClipBalloon(WDock * dock, int workspace)
-{
- int w, h;
- int x, y;
- WScreen *scr = dock->screen_ptr;
- char *text;
- Window stack[2];
-
- scr->flags.clip_balloon_mapped = 1;
- XMapWindow(dpy, scr->clip_balloon);
-
- text = scr->workspaces[workspace]->name;
-
- w = WMWidthOfString(scr->clip_title_font, text, strlen(text));
-
- h = WMFontHeight(scr->clip_title_font);
- XResizeWindow(dpy, scr->clip_balloon, w, h);
-
- x = dock->x_pos + CLIP_BUTTON_SIZE * ICON_SIZE / 64;
- y = dock->y_pos + ICON_SIZE - WMFontHeight(scr->clip_title_font) - 3;
-
- if (x + w > scr->scr_width) {
- x = scr->scr_width - w;
- if (dock->y_pos + ICON_SIZE + h > scr->scr_height)
- y = dock->y_pos - h - 1;
- else
- y = dock->y_pos + ICON_SIZE;
- XRaiseWindow(dpy, scr->clip_balloon);
- } else {
- stack[0] = scr->clip_icon->icon->core->window;
- stack[1] = scr->clip_balloon;
- XRestackWindows(dpy, stack, 2);
- }
- XMoveWindow(dpy, scr->clip_balloon, x, y);
- XClearWindow(dpy, scr->clip_balloon);
- WMDrawString(scr->wmscreen, scr->clip_balloon,
- scr->clip_title_color[CLIP_NORMAL], scr->clip_title_font,
0, 0, text, strlen(text));
-}
-
static void clipEnterNotify(WObjDescriptor * desc, XEvent * event)
{
WAppIcon *btn = (WAppIcon *) desc->parent;
@@ -3893,15 +3847,6 @@ static void clipEnterNotify(WObjDescriptor * desc,
XEvent * event)
if (dock->auto_collapse && !dock->auto_expand_magic) {
dock->auto_expand_magic = WMAddTimerHandler(AUTO_EXPAND_DELAY,
clipAutoExpand, (void *)dock);
}
-
- if (btn->xindex == 0 && btn->yindex == 0)
- showClipBalloon(dock, dock->screen_ptr->current_workspace);
- else {
- if (dock->screen_ptr->flags.clip_balloon_mapped) {
- XUnmapWindow(dpy, dock->screen_ptr->clip_balloon);
- dock->screen_ptr->flags.clip_balloon_mapped = 0;
- }
- }
}
static void clipLeave(WDock * dock)
@@ -4008,10 +3953,6 @@ static void clipAutoRaise(void *cdata)
if (dock->auto_raise_lower)
wDockRaise(dock);
- if (dock->screen_ptr->flags.clip_balloon_mapped) {
- showClipBalloon(dock, dock->screen_ptr->current_workspace);
- }
-
dock->auto_raise_magic = NULL;
}
diff --git a/src/event.c b/src/event.c
index 561b1f2..3bc3c40 100644
--- a/src/event.c
+++ b/src/event.c
@@ -1155,19 +1155,6 @@ static void handleEnterNotify(XEvent * event)
}
}
- /* a little kluge to hide the clip balloon */
- if (!wPreferences.flags.noclip && scr->flags.clip_balloon_mapped) {
- if (!desc) {
- XUnmapWindow(dpy, scr->clip_balloon);
- scr->flags.clip_balloon_mapped = 0;
- } else {
- if (desc->parent_type != WCLASS_DOCK_ICON ||
scr->clip_icon != desc->parent) {
- XUnmapWindow(dpy, scr->clip_balloon);
- scr->flags.clip_balloon_mapped = 0;
- }
- }
- }
-
if (event->xcrossing.window == event->xcrossing.root
&& event->xcrossing.detail == NotifyNormal
&& event->xcrossing.detail != NotifyInferior &&
wPreferences.focus_mode != WKF_CLICK) {
diff --git a/src/screen.h b/src/screen.h
index 74dabae..af5a97b 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -283,7 +283,6 @@ typedef struct _WScreen {
unsigned int added_windows_menu:1;
unsigned int startup2:1; /* startup phase 2 */
unsigned int supports_tiff:1;
- unsigned int clip_balloon_mapped:1;
unsigned int next_click_is_not_double:1;
unsigned int backimage_helper_launched:1;
/* some client has issued a WM_COLORMAP_NOTIFY */
-----------------------------------------------------------------------
Summary of changes:
src/dock.c | 1 -
src/funcs.h | 2 --
src/menu.c | 33 ---------------------------------
3 files changed, 0 insertions(+), 36 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].
