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 e51598bbf557dccdd9d8325fd6d150d69a518bc2 (commit)
via 126076811d63be4a29633b8e20079326830db9e4 (commit)
from eb46e503ddcd3e41c317d418c053312036e064a1 (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/e51598bbf557dccdd9d8325fd6d150d69a518bc2
commit e51598bbf557dccdd9d8325fd6d150d69a518bc2
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/126076811d63be4a29633b8e20079326830db9e4
commit 126076811d63be4a29633b8e20079326830db9e4
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)
-----------------------------------------------------------------------
Summary of changes:
src/balloon.c | 23 +++++++++++++----------
util/wmgenmenu.h | 2 +-
2 files changed, 14 insertions(+), 11 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].
