gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-21 05:18:06 +01:00
Code Issues Projects Releases Wiki Activity

Constrain switching workspace name to one head.

Browse Source 
When switching workspaces, force the name to be shown entirely within
one head of a Xinerama display. Previously the name would span heads if
set to TOP, CENTER or BOTTOM alignment, and was hence hard to read when
the display comprised an even number of heads.
This commit is contained in:
Iain Patterson
2009-09-14 12:59:10 +01:00
committed by Carlos R. Mafra
parent 9789cf3154
commit 1a27b34160
1 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/workspace.c
View File

@@ -262,6 +262,11 @@ static void showWorkspaceName(WScreen * scr, int workspace)
char *name = scr->workspaces[workspace]->name;
int len = strlen(name);
int x, y;
#ifdef XINERAMA
int head;
WMRect rect;
int xx, yy;
#endif
if (wPreferences.workspace_name_display_position == WD_NONE || scr->workspace_count < 2) {
return;
@@ -286,13 +291,34 @@ static void showWorkspaceName(WScreen * scr, int workspace)
w = WMWidthOfString(scr->workspace_name_font, name, len);
h = WMFontHeight(scr->workspace_name_font);
#ifdef XINERAMA
head = wGetHeadForPointerLocation(scr);
rect = wGetRectForHead(scr, head);
if (scr->xine_info.count) {
xx = rect.pos.x + (scr->xine_info.screens[head].size.width - (w+4))/2;
yy = rect.pos.y + (scr->xine_info.screens[head].size.height - (h+4))/2;
}
else {
xx = (scr->scr_width - (w+4))/2;
yy = (scr->scr_height - (h+4))/2;
}
#endif
switch (wPreferences.workspace_name_display_position) {
case WD_TOP:
#ifdef XINERAMA
px = xx;
#else
px = (scr->scr_width - (w + 4)) / 2;
#endif
py = 0;
break;
case WD_BOTTOM:
#ifdef XINERAMA
px = xx;
#else
px = (scr->scr_width - (w + 4)) / 2;
#endif
py = scr->scr_height - (h + 4);
break;
case WD_TOPLEFT:
@@ -313,8 +339,13 @@ static void showWorkspaceName(WScreen * scr, int workspace)
break;
case WD_CENTER:
default:
#ifdef XINERAMA
px = xx;
py = yy;
#else
px = (scr->scr_width - (w + 4)) / 2;
py = (scr->scr_height - (h + 4)) / 2;
#endif
break;
}
XResizeWindow(dpy, scr->workspace_name, w + 4, h + 4);