src/WindowMaker.h | 4 ++++ src/defaults.c | 14 ++++++++++++++ src/framewin.c | 16 ++++++++++++++-- src/framewin.h | 5 ++++- src/menu.c | 5 ++++- src/moveres.c | 2 ++ src/placement.c | 3 +++ src/window.c | 10 ++++++++-- 8 files changed, 53 insertions(+), 6 deletions(-) diff --git a/src/WindowMaker.h b/src/WindowMaker.h index d959e35..f1ce577 100644 --- a/src/WindowMaker.h +++ b/src/WindowMaker.h @@ -371,7 +371,11 @@ typedef struct WPreferences { 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; diff --git a/src/defaults.c b/src/defaults.c index 5cdee58..2ea652c 100644 --- a/src/defaults.c +++ b/src/defaults.c @@ -376,6 +376,8 @@ WDefaultEntry staticOptionList[] = { }; +#define NUM2STRING_(x) #x +#define NUM2STRING(x) NUM2STRING_(x) WDefaultEntry optionList[] = { /* dynamic options */ @@ -601,9 +603,21 @@ WDefaultEntry optionList[] = { {"WindowTitleExtendSpace", DEF_WINDOW_TITLE_EXTEND_SPACE, NULL, &wPreferences.window_title_clearance, getInt, setClearance }, + {"WindowTitleMinHeight", "0", NULL, + &wPreferences.window_title_min_height, getInt, setClearance + }, + {"WindowTitleMaxHeight", NUM2STRING(INT_MAX), NULL, + &wPreferences.window_title_max_height, getInt, setClearance + }, {"MenuTitleExtendSpace", DEF_MENU_TITLE_EXTEND_SPACE, NULL, &wPreferences.menu_title_clearance, getInt, setClearance }, + {"MenuTitleMinHeight", "0", NULL, + &wPreferences.menu_title_min_height, getInt, setClearance + }, + {"MenuTitleMaxHeight", NUM2STRING(INT_MAX), NULL, + &wPreferences.menu_title_max_height, getInt, setClearance + }, {"MenuTextExtendSpace", DEF_MENU_TEXT_EXTEND_SPACE, NULL, &wPreferences.menu_text_clearance, getInt, setClearance }, diff --git a/src/framewin.c b/src/framewin.c index 441fe18..6c87498 100644 --- a/src/framewin.c +++ b/src/framewin.c @@ -63,7 +63,8 @@ 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) { @@ -80,6 +81,8 @@ 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; @@ -130,7 +133,11 @@ wFrameWindowUpdateBorders(WFrameWindow *fwin, int flags) height = fwin->core->height - fwin->top_width - fwin->bottom_width; if (flags & WFF_TITLEBAR) - theight = WMFontHeight(*fwin->font) + (*fwin->title_clearance + TITLEBAR_EXTEND_SPACE) * 2; + { + 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; + } else theight = 0; @@ -490,6 +497,8 @@ 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; @@ -1097,8 +1106,11 @@ wFrameWindowPaint(WFrameWindow *fwin) break; } + 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 18ba07b..2c9e094 100644 --- a/src/framewin.h +++ b/src/framewin.h @@ -59,6 +59,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; @@ -149,7 +151,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 3878efe..72cbd7c 100644 --- a/src/menu.c +++ b/src/menu.c @@ -180,7 +180,10 @@ 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, + 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); diff --git a/src/moveres.c b/src/moveres.c index 7d4fccb..07ec2b1 100644 --- a/src/moveres.c +++ b/src/moveres.c @@ -497,6 +497,8 @@ drawTransparentFrame(WWindow *wwin, int x, int y, int width, int height) 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 diff --git a/src/placement.c b/src/placement.c index b697367..737d6b5 100644 --- a/src/placement.c +++ b/src/placement.c @@ -594,6 +594,9 @@ PlaceWindow(WWindow *wwin, int *x_ret, int *y_ret, { 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 39eba85..4c0a8fc 100644 --- a/src/window.c +++ b/src/window.c @@ -1282,7 +1282,10 @@ 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, @@ -1619,7 +1622,10 @@ 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,