Adds WindowTitleMinHeight, WindowTitleMaxHeight, MenuTitleMinHeight and MenuTitleMaxHeight options, that provides more control over titlebar look.
Original-patch-by: Alexey Voinov <[email protected]> Signed-off-by: Alexey I. Froloff <[email protected]> --- src/WindowMaker.h | 4 ++++ src/defaults.c | 11 +++++++++++ src/framewin.c | 15 ++++++++++++--- src/framewin.h | 5 ++++- src/menu.c | 9 ++++++--- src/moveres.c | 10 ++++++++-- src/placement.c | 2 ++ src/window.c | 10 ++++++++-- 8 files changed, 55 insertions(+), 11 deletions(-) diff --git a/src/WindowMaker.h b/src/WindowMaker.h index 9ec628b..ac37bc4 100644 --- a/src/WindowMaker.h +++ b/src/WindowMaker.h @@ -336,7 +336,11 @@ typedef struct WPreferences { char open_transients_with_parent; /* open transient window in same workspace as parent */ signed char title_justification; /* titlebar text alignment */ int window_title_clearance; + int window_title_min_height; + int window_title_max_height; int menu_title_clearance; + int menu_title_min_height; + int menu_title_max_height; int menu_text_clearance; char multi_byte_text; #ifdef KEEP_XKB_LOCK_STATUS diff --git a/src/defaults.c b/src/defaults.c index 930d47c..b3660ca 100644 --- a/src/defaults.c +++ b/src/defaults.c @@ -321,6 +321,9 @@ WDefaultEntry staticOptionList[] = { &wPreferences.disable_miniwindows, getBool, NULL, NULL, NULL} }; +#define NUM2STRING_(x) #x +#define NUM2STRING(x) NUM2STRING_(x) + WDefaultEntry optionList[] = { /* dynamic options */ @@ -449,8 +452,16 @@ WDefaultEntry optionList[] = { NULL, getFont, setWinTitleFont, NULL, NULL}, {"WindowTitleExtendSpace", DEF_WINDOW_TITLE_EXTEND_SPACE, NULL, &wPreferences.window_title_clearance, getInt, setClearance, NULL, NULL}, + {"WindowTitleMinHeight", "0", NULL, + &wPreferences.window_title_min_height, getInt, setClearance, NULL, NULL}, + {"WindowTitleMaxHeight", NUM2STRING(INT_MAX), NULL, + &wPreferences.window_title_max_height, getInt, setClearance, NULL, NULL}, {"MenuTitleExtendSpace", DEF_MENU_TITLE_EXTEND_SPACE, NULL, &wPreferences.menu_title_clearance, getInt, setClearance, NULL, NULL}, + {"MenuTitleMinHeight", "0", NULL, + &wPreferences.menu_title_min_height, getInt, setClearance, NULL, NULL}, + {"MenuTitleMaxHeight", NUM2STRING(INT_MAX), NULL, + &wPreferences.menu_title_max_height, getInt, setClearance, NULL, NULL}, {"MenuTextExtendSpace", DEF_MENU_TEXT_EXTEND_SPACE, NULL, &wPreferences.menu_text_clearance, getInt, setClearance, NULL, NULL}, {"MenuTitleFont", DEF_MENU_TITLE_FONT, NULL, diff --git a/src/framewin.c b/src/framewin.c index 5d3ec49..b81cb99 100644 --- a/src/framewin.c +++ b/src/framewin.c @@ -60,7 +60,8 @@ static void paintButton(WCoreWindow * button, WTexture * texture, static void updateTitlebar(WFrameWindow * fwin); WFrameWindow *wFrameWindowCreate(WScreen * scr, int wlevel, int x, int y, - int width, int height, int *clearance, int flags, + int width, int height, int *clearance, + int *title_min, int *title_max, int flags, WTexture ** title_texture, WTexture ** resize_texture, WMColor ** color, WMFont ** font) { @@ -77,6 +78,8 @@ WFrameWindow *wFrameWindowCreate(WScreen * scr, int wlevel, int x, int y, fwin->resizebar_texture = resize_texture; fwin->title_color = color; fwin->title_clearance = clearance; + fwin->title_min_height = title_min; + fwin->title_max_height = title_max; fwin->font = font; #ifdef KEEP_XKB_LOCK_STATUS fwin->languagemode = XkbGroup1Index; @@ -122,9 +125,11 @@ void wFrameWindowUpdateBorders(WFrameWindow * fwin, int flags) else height = fwin->core->height - fwin->top_width - fwin->bottom_width; - if (flags & WFF_TITLEBAR) + if (flags & WFF_TITLEBAR) { theight = WMFontHeight(*fwin->font) + (*fwin->title_clearance + TITLEBAR_EXTEND_SPACE) * 2; - else + if(theight > *fwin->title_max_height) theight = *fwin->title_max_height; + if(theight < *fwin->title_min_height) theight = *fwin->title_min_height; + } else theight = 0; if (wPreferences.new_style) { @@ -441,6 +446,8 @@ static void updateTitlebar(WFrameWindow * fwin) int theight; theight = WMFontHeight(*fwin->font) + (*fwin->title_clearance + TITLEBAR_EXTEND_SPACE) * 2; + if(theight > *fwin->title_max_height) theight = *fwin->title_max_height; + if(theight < *fwin->title_min_height) theight = *fwin->title_min_height; x = 0; w = fwin->core->width + 1; @@ -997,6 +1004,8 @@ void wFrameWindowPaint(WFrameWindow * fwin) y = *fwin->title_clearance + TITLEBAR_EXTEND_SPACE; h = WMFontHeight(*fwin->font); + if(y*2 + h > *fwin->title_max_height) y = (*fwin->title_max_height - h)/2; + if(y*2 + h < *fwin->title_min_height) y = (*fwin->title_min_height - h)/2; /* We use a w+2 buffer to have an extra pixel on the left and * another one on the right. This is because for some odd reason, diff --git a/src/framewin.h b/src/framewin.h index a0c586c..7f896d4 100644 --- a/src/framewin.h +++ b/src/framewin.h @@ -61,6 +61,8 @@ typedef struct WFrameWindow { short top_width; int *title_clearance; + int *title_min_height; + int *title_max_height; short bottom_width; short resizebar_corner_width; @@ -151,7 +153,8 @@ typedef struct WFrameWindow { WFrameWindow* wFrameWindowCreate(WScreen *scr, int wlevel, int x, int y, - int width, int height, int *clearance, int flags, + int width, int height, int *clearance, + int *title_min, int *title_max, int flags, union WTexture **title_texture, union WTexture **resize_texture, WMColor **color, WMFont **font); diff --git a/src/menu.c b/src/menu.c index e6eff2a..0890382 100644 --- a/src/menu.c +++ b/src/menu.c @@ -161,9 +161,12 @@ WMenu *wMenuCreate(WScreen * screen, char *title, int main_menu) menu->flags.titled = 1; } menu->frame = - wFrameWindowCreate(screen, tmp, 8, 2, 1, 1, &wPreferences.menu_title_clearance, flags, - screen->menu_title_texture, NULL, - screen->menu_title_color, &screen->menu_title_font); + wFrameWindowCreate(screen, tmp, 8, 2, 1, 1, &wPreferences.menu_title_clearance, + &wPreferences.menu_title_min_height, + &wPreferences.menu_title_max_height, + flags, + screen->menu_title_texture, NULL, + screen->menu_title_color, &screen->menu_title_font); menu->frame->core->descriptor.parent = menu; menu->frame->core->descriptor.parent_type = WCLASS_MENU; diff --git a/src/moveres.c b/src/moveres.c index 040e88d..271d36b 100644 --- a/src/moveres.c +++ b/src/moveres.c @@ -471,6 +471,8 @@ static void drawTransparentFrame(WWindow * wwin, int x, int y, int width, int he if (HAS_TITLEBAR(wwin) && !wwin->flags.shaded) { h = WMFontHeight(wwin->screen_ptr->title_font) + (wPreferences.window_title_clearance + TITLEBAR_EXTEND_SPACE) * 2; + if(h > wPreferences.window_title_max_height) h = wPreferences.window_title_max_height; + if(h < wPreferences.window_title_min_height) h = wPreferences.window_title_min_height; } if (HAS_RESIZEBAR(wwin) && !wwin->flags.shaded) { /* Can't use wwin-frame->bottom_width because, in some cases @@ -1879,10 +1881,12 @@ void wMouseResizeWindow(WWindow * wwin, XEvent * ev) ry2 = fy + fh - 1; shiftl = XKeysymToKeycode(dpy, XK_Shift_L); shiftr = XKeysymToKeycode(dpy, XK_Shift_R); - if (HAS_TITLEBAR(wwin)) + if (HAS_TITLEBAR(wwin)) { h = WMFontHeight(wwin->screen_ptr->title_font) + (wPreferences.window_title_clearance + TITLEBAR_EXTEND_SPACE) * 2; - else + if(h > wPreferences.window_title_max_height) h = wPreferences.window_title_max_height; + if(h < wPreferences.window_title_min_height) h = wPreferences.window_title_min_height; + } else h = 0; while (1) { WMMaskEvent(dpy, KeyPressMask | ButtonMotionMask @@ -2192,6 +2196,8 @@ void InteractivePlaceWindow(WWindow * wwin, int *x_ret, int *y_ret, unsigned wid if (HAS_TITLEBAR(wwin)) { h = WMFontHeight(scr->title_font) + (wPreferences.window_title_clearance + TITLEBAR_EXTEND_SPACE) * 2; + if(h > wPreferences.window_title_max_height) h = wPreferences.window_title_max_height; + if(h < wPreferences.window_title_min_height) h = wPreferences.window_title_min_height; height += h; } if (HAS_RESIZEBAR(wwin)) { diff --git a/src/placement.c b/src/placement.c index b891a7a..eb27f97 100644 --- a/src/placement.c +++ b/src/placement.c @@ -486,6 +486,8 @@ void PlaceWindow(WWindow *wwin, int *x_ret, int *y_ret, unsigned width, unsigned WScreen *scr = wwin->screen_ptr; int h = WMFontHeight(scr->title_font) + (wPreferences.window_title_clearance + TITLEBAR_EXTEND_SPACE) * 2; + if(h > wPreferences.window_title_max_height) h = wPreferences.window_title_max_height; + if(h < wPreferences.window_title_min_height) h = wPreferences.window_title_min_height; WArea usableArea = wGetUsableAreaForHead(scr, wGetHeadForPointerLocation(scr), NULL, True); diff --git a/src/window.c b/src/window.c index 39116db..a7ed37e 100644 --- a/src/window.c +++ b/src/window.c @@ -1102,7 +1102,10 @@ WWindow *wManageWindow(WScreen *scr, Window window) wwin->frame = wFrameWindowCreate(scr, window_level, x, y, width, height, - &wPreferences.window_title_clearance, foo, + &wPreferences.window_title_clearance, + &wPreferences.window_title_min_height, + &wPreferences.window_title_max_height, + foo, scr->window_title_texture, scr->resizebar_texture, scr->window_title_color, &scr->title_font); @@ -1404,7 +1407,10 @@ WWindow *wManageInternalWindow(WScreen *scr, Window window, Window owner, wwin->frame = wFrameWindowCreate(scr, WMFloatingLevel, wwin->frame_x, wwin->frame_y, width, height, - &wPreferences.window_title_clearance, foo, + &wPreferences.window_title_clearance, + &wPreferences.window_title_min_height, + &wPreferences.window_title_max_height, + foo, scr->window_title_texture, scr->resizebar_texture, scr->window_title_color, &scr->title_font); -- 1.7.2.3 -- To unsubscribe, send mail to [email protected].
