koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement support for user configuration of constraints on floating window dimensions.

Browse Source
This commit is contained in:
D Thompson
2012-02-16 06:36:46 -08:00
committed by Michael Stapelberg
parent 5edacf4943
commit 82146fcebf
5 changed files with 107 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cfgparse.l
View File

@ -176,6 +176,8 @@ mode { return TOKMODE; }
bind { yy_push_state(WANT_STRING); yy_push_state(EAT_WHITESPACE); yy_push_state(EAT_WHITESPACE); return TOKBINDCODE; }
bindcode { yy_push_state(WANT_STRING); yy_push_state(EAT_WHITESPACE); yy_push_state(EAT_WHITESPACE); return TOKBINDCODE; }
bindsym { yy_push_state(BINDSYM_COND); yy_push_state(EAT_WHITESPACE); return TOKBINDSYM; }
floating_maximum_size { return TOKFLOATING_MAXIMUM_SIZE; }
floating_minimum_size { return TOKFLOATING_MINIMUM_SIZE; }
floating_modifier { return TOKFLOATING_MODIFIER; }
workspace { return TOKWORKSPACE; }
output { yy_push_state(OUTPUT_COND); yy_push_state(EAT_WHITESPACE); return TOKOUTPUT; }

24
src/cfgparse.y
View File

@ -664,6 +664,8 @@ void parse_file(const char *f) {
%token TOKCONTROL "control"
%token TOKSHIFT "shift"
%token TOKFLOATING_MODIFIER "floating_modifier"
%token TOKFLOATING_MAXIMUM_SIZE "floating_maximum_size"
%token TOKFLOATING_MINIMUM_SIZE "floating_minimum_size"
%token <string> QUOTEDSTRING "<quoted string>"
%token TOKWORKSPACE "workspace"
%token TOKOUTPUT "output"
@ -778,6 +780,8 @@ line:
| for_window
| mode
| bar
| floating_maximum_size
| floating_minimum_size
| floating_modifier
| orientation
| workspace_layout
@ -1292,6 +1296,26 @@ bar_color_urgent_workspace:
}
;
floating_maximum_size:
TOKFLOATING_MAXIMUM_SIZE NUMBER WORD NUMBER
{
printf("floating_maximum_width = %d\n", $2);
printf("floating_maximum_height = %d\n", $4);
config.floating_maximum_width = $2;
config.floating_maximum_height = $4;
}
;
floating_minimum_size:
TOKFLOATING_MINIMUM_SIZE NUMBER WORD NUMBER
{
printf("floating_minimum_width = %d\n", $2);
printf("floating_minimum_height = %d\n", $4);
config.floating_minimum_width = $2;
config.floating_minimum_height = $4;
}
;
floating_modifier:
TOKFLOATING_MODIFIER binding_modifiers
{

57
src/floating.c
View File

@ -11,6 +11,21 @@
extern xcb_connection_t *conn;
/*
* Calculates sum of heights and sum of widths of all currently active outputs
*
*/
Rect total_outputs_dimensions() {
Output *output;
/* Use Rect to encapsulate dimensions, ignoring x/y */
Rect outputs_dimensions = {0, 0, 0, 0};
TAILQ_FOREACH(output, &outputs, outputs) {
outputs_dimensions.height += output->rect.height;
outputs_dimensions.width += output->rect.width;
}
return outputs_dimensions;
}
void floating_enable(Con *con, bool automatic) {
bool set_focus = (con == focused);
@ -120,9 +135,45 @@ void floating_enable(Con *con, bool automatic) {
nc->rect.height = max(nc->rect.height, child->geometry.height);
}
}
/* Raise the width/height to at least 75x50 (minimum size for windows) */
nc->rect.width = max(nc->rect.width, 75);
nc->rect.height = max(nc->rect.height, 50);
/* Define reasonable minimal and maximal sizes for floating windows */
const int floating_sane_min_height = 50;
const int floating_sane_min_width = 75;
Rect floating_sane_max_dimensions;
floating_sane_max_dimensions = total_outputs_dimensions();
/* Unless user requests otherwise (-1), ensure width/height do not exceed
* configured maxima or, if unconfigured, limit to combined width of all
* outputs */
if (config.floating_maximum_height != -1) {
if (config.floating_maximum_height == 0)
nc->rect.height = min(nc->rect.height, floating_sane_max_dimensions.height);
else
nc->rect.height = min(nc->rect.height, config.floating_maximum_height);
}
if (config.floating_maximum_width != -1) {
if (config.floating_maximum_width == 0)
nc->rect.width = min(nc->rect.width, floating_sane_max_dimensions.width);
else
nc->rect.width = min(nc->rect.width, config.floating_maximum_width);
}
/* Unless user requests otherwise (-1), raise the width/height to
* reasonable minimum dimensions */
if (config.floating_minimum_height != -1) {
if (config.floating_minimum_height == 0)
nc->rect.height = max(nc->rect.height, floating_sane_min_height);
else
nc->rect.height = max(nc->rect.height, config.floating_minimum_height);
}
if (config.floating_minimum_width != -1) {
if (config.floating_minimum_width == 0)
nc->rect.width = max(nc->rect.width, floating_sane_min_width);
else
nc->rect.width = max(nc->rect.width, config.floating_minimum_width);
}
/* add pixels for the decoration */
/* TODO: don’t add them when the user automatically puts new windows into
* 1pixel/borderless mode */