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 eb46e503ddcd3e41c317d418c053312036e064a1 (commit)
via db3a4dd40470f970ffd4d23f769715dbddc134c7 (commit)
via 393a917a4f765672382640717273bd5fb8b2a776 (commit)
from 8d7c725b7b7a09ebd0f1595cc3f07f362fe82c6f (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/eb46e503ddcd3e41c317d418c053312036e064a1
commit eb46e503ddcd3e41c317d418c053312036e064a1
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..466b386 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -3002,8 +3002,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 +3745,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 +3811,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 +3848,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 +3954,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 */
http://repo.or.cz/w/wmaker-crm.git/commit/db3a4dd40470f970ffd4d23f769715dbddc134c7
commit db3a4dd40470f970ffd4d23f769715dbddc134c7
Author: Carlos R. Mafra <[email protected]>
Date: Sat Feb 11 20:01:24 2012 +0000
dock: Trivial code style cleanups
Just random things I noticed while reading the code...
Signed-off-by: Carlos R. Mafra <[email protected]>
diff --git a/src/dock.c b/src/dock.c
index bf3f078..0928320 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -1151,8 +1151,6 @@ void wClipIconPaint(WAppIcon * aicon)
if(wPreferences.show_clip_title)
WMDrawString(scr->wmscreen, win, color, scr->clip_title_font,
tx, ty, ws_name, length);
- /*WMDrawString(scr->wmscreen, win, color, scr->clip_title_font, 4,
- 2, ws_name, length); */
tx = (ICON_SIZE / 2 - WMWidthOfString(scr->clip_title_font, ws_number,
nlength)) / 2;
@@ -1560,9 +1558,7 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList *
dock_state, int type)
WMRetainPropList(dock_state);
/* restore position */
-
value = WMGetFromPLDictionary(dock_state, dPosition);
-
if (value) {
if (!WMIsPLString(value)) {
COMPLAIN("Position");
@@ -1604,11 +1600,9 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList *
dock_state, int type)
}
/* restore lowered/raised state */
-
dock->lowered = 0;
value = WMGetFromPLDictionary(dock_state, dLowered);
-
if (value) {
if (!WMIsPLString(value)) {
COMPLAIN("Lowered");
@@ -1620,11 +1614,9 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList *
dock_state, int type)
}
/* restore collapsed state */
-
dock->collapsed = 0;
value = WMGetFromPLDictionary(dock_state, dCollapsed);
-
if (value) {
if (!WMIsPLString(value)) {
COMPLAIN("Collapsed");
@@ -1636,9 +1628,7 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList *
dock_state, int type)
}
/* restore auto-collapsed state */
-
value = WMGetFromPLDictionary(dock_state, dAutoCollapse);
-
if (value) {
if (!WMIsPLString(value)) {
COMPLAIN("AutoCollapse");
@@ -1651,32 +1641,26 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList *
dock_state, int type)
}
/* restore auto-raise/lower state */
-
value = WMGetFromPLDictionary(dock_state, dAutoRaiseLower);
-
if (value) {
if (!WMIsPLString(value)) {
COMPLAIN("AutoRaiseLower");
} else {
- if (strcasecmp(WMGetFromPLString(value), "YES") == 0) {
+ if (strcasecmp(WMGetFromPLString(value), "YES") == 0)
dock->auto_raise_lower = 1;
- }
}
}
/* restore attract icons state */
-
dock->attract_icons = 0;
value = WMGetFromPLDictionary(dock_state, dAutoAttractIcons);
-
if (value) {
if (!WMIsPLString(value)) {
COMPLAIN("AutoAttractIcons");
} else {
- if (strcasecmp(WMGetFromPLString(value), "YES") == 0) {
+ if (strcasecmp(WMGetFromPLString(value), "YES") == 0)
dock->attract_icons = 1;
- }
}
}
@@ -1700,17 +1684,14 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList *
dock_state, int type)
apps = WMGetFromPLDictionary(dock_state, tmp);
WMReleasePropList(tmp);
- if (!apps) {
+ if (!apps)
apps = WMGetFromPLDictionary(dock_state, dApplications);
- }
}
- if (!apps) {
+ if (!apps)
goto finish;
- }
count = WMGetPropListItemCount(apps);
-
if (count == 0)
goto finish;
http://repo.or.cz/w/wmaker-crm.git/commit/393a917a4f765672382640717273bd5fb8b2a776
commit 393a917a4f765672382640717273bd5fb8b2a776
Author: Carlos R. Mafra <[email protected]>
Date: Sat Feb 11 19:03:43 2012 +0000
Remove dead code ifdef'ed by GRADIENT_CLIP_ARROW
GRADIENT_CLIP_ARROW was never defined anywhere and having fancier clip
arrows is not something particularly interesting, so let's simply remove
the code.
Signed-off-by: Carlos R. Mafra <[email protected]>
diff --git a/src/defaults.c b/src/defaults.c
index 2b6efd6..b5ea8e2 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -2520,30 +2520,8 @@ static int setClipTitleColor(WScreen * scr,
WDefaultEntry * entry, XColor * colo
{
if (scr->clip_title_color[widx])
WMReleaseColor(scr->clip_title_color[widx]);
- scr->clip_title_color[widx] = WMCreateRGBColor(scr->wmscreen,
color->red, color->green, color->blue, True);
-#ifdef GRADIENT_CLIP_ARROW
- if (widx == CLIP_NORMAL) {
- RImage *image;
- RColor color1, color2;
- int pt = CLIP_BUTTON_SIZE * wPreferences.icon_size / 64;
- int as = pt - 15; /* 15 = 5+5+5 */
-
- FREE_PIXMAP(scr->clip_arrow_gradient);
-
- color1.red = (color->red >> 8) * 6 / 10;
- color1.green = (color->green >> 8) * 6 / 10;
- color1.blue = (color->blue >> 8) * 6 / 10;
-
- color2.red = WMIN((color->red >> 8) * 20 / 10, 255);
- color2.green = WMIN((color->green >> 8) * 20 / 10, 255);
- color2.blue = WMIN((color->blue >> 8) * 20 / 10, 255);
-
- image = RRenderGradient(as + 1, as + 1, &color1, &color2,
RDiagonalGradient);
- RConvertImage(scr->rcontext, image, &scr->clip_arrow_gradient);
- RReleaseImage(image);
- }
-#endif /* GRADIENT_CLIP_ARROW */
+ scr->clip_title_color[widx] = WMCreateRGBColor(scr->wmscreen,
color->red, color->green, color->blue, True);
wFreeColor(scr, color->pixel);
return REFRESH_ICON_TITLE_COLOR;
diff --git a/src/dock.c b/src/dock.c
index 96d8c61..bf3f078 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -305,14 +305,7 @@ static void paintClipButtons(WAppIcon * clipIcon, Bool
lpushed, Bool rpushed)
int as = pt - 15; /* 15 = 5+5+5 */
GC gc = scr->draw_gc; /* maybe use WMColorGC() instead here? */
WMColor *color;
-#ifdef GRADIENT_CLIP_ARROW
- Bool collapsed = clipIcon->dock->collapsed;
-#endif
- /*if (!clipIcon->dock->collapsed)
- color = scr->clip_title_color[CLIP_NORMAL];
- else
- color = scr->clip_title_color[CLIP_COLLAPSED]; */
color = scr->clip_title_color[CLIP_NORMAL];
XSetForeground(dpy, gc, WMColorPixel(color));
@@ -337,14 +330,6 @@ static void paintClipButtons(WAppIcon * clipIcon, Bool
lpushed, Bool rpushed)
XFillPolygon(dpy, win, scr->draw_gc, p, 3, Convex,
CoordModeOrigin);
XSetForeground(dpy, scr->draw_gc, scr->black_pixel);
}
-#ifdef GRADIENT_CLIP_ARROW
- if (!collapsed) {
- XSetFillStyle(dpy, scr->copy_gc, FillTiled);
- XSetTile(dpy, scr->copy_gc, scr->clip_arrow_gradient);
- XSetClipMask(dpy, scr->copy_gc, None);
- gc = scr->copy_gc;
- }
-#endif /* GRADIENT_CLIP_ARROW */
/* top right arrow */
p[0].x = p[3].x = ICON_SIZE - 5 - as;
@@ -357,10 +342,6 @@ static void paintClipButtons(WAppIcon * clipIcon, Bool
lpushed, Bool rpushed)
XFillPolygon(dpy, win, scr->draw_gc, p, 3, Convex,
CoordModeOrigin);
XDrawLines(dpy, win, scr->draw_gc, p, 4, CoordModeOrigin);
} else {
-#ifdef GRADIENT_CLIP_ARROW
- if (!collapsed)
- XSetTSOrigin(dpy, gc, ICON_SIZE - 6 - as, 5);
-#endif
XFillPolygon(dpy, win, gc, p, 3, Convex, CoordModeOrigin);
XDrawLines(dpy, win, gc, p, 4, CoordModeOrigin);
}
@@ -376,17 +357,9 @@ static void paintClipButtons(WAppIcon * clipIcon, Bool
lpushed, Bool rpushed)
XFillPolygon(dpy, win, scr->draw_gc, p, 3, Convex,
CoordModeOrigin);
XDrawLines(dpy, win, scr->draw_gc, p, 4, CoordModeOrigin);
} else {
-#ifdef GRADIENT_CLIP_ARROW
- if (!collapsed)
- XSetTSOrigin(dpy, gc, 5, ICON_SIZE - 6 - as);
-#endif
XFillPolygon(dpy, win, gc, p, 3, Convex, CoordModeOrigin);
XDrawLines(dpy, win, gc, p, 4, CoordModeOrigin);
}
-#ifdef GRADIENT_CLIP_ARROW
- if (!collapsed)
- XSetFillStyle(dpy, scr->copy_gc, FillSolid);
-#endif
}
RImage *wClipMakeTile(WScreen * scr, RImage * normalTile)
diff --git a/src/screen.h b/src/screen.h
index b95ba29..74dabae 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -223,11 +223,6 @@ typedef struct _WScreen {
Window clip_balloon; /* window for workspace name */
int keymove_tick;
-
-#ifdef GRADIENT_CLIP_ARROW
- Pixmap clip_arrow_gradient;
-#endif
-
struct RContext *rcontext; /* wrlib context */
WMScreen *wmscreen; /* for widget library */
-----------------------------------------------------------------------
Summary of changes:
src/defaults.c | 24 +-----------
src/dock.c | 112 ++------------------------------------------------------
src/event.c | 13 ------
src/screen.h | 6 ---
4 files changed, 5 insertions(+), 150 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].
