Add new_float config option.
This option sets the default border style for containers automatically put into floating mode. Fixes #264
This commit is contained in:
parent
cd5ebc2dca
commit
42db9de7ec
|
@ -126,6 +126,9 @@ struct Config {
|
||||||
/** The default border style for new windows. */
|
/** The default border style for new windows. */
|
||||||
border_style_t default_border;
|
border_style_t default_border;
|
||||||
|
|
||||||
|
/** The default border style for new floating windows. */
|
||||||
|
border_style_t default_floating_border;
|
||||||
|
|
||||||
/** The modifier which needs to be pressed in combination with your mouse
|
/** The modifier which needs to be pressed in combination with your mouse
|
||||||
* buttons to do things with floating windows (move, resize) */
|
* buttons to do things with floating windows (move, resize) */
|
||||||
uint32_t floating_modifier;
|
uint32_t floating_modifier;
|
||||||
|
|
|
@ -118,6 +118,7 @@ vertical { return TOK_VERT; }
|
||||||
auto { return TOK_AUTO; }
|
auto { return TOK_AUTO; }
|
||||||
workspace_layout { return TOK_WORKSPACE_LAYOUT; }
|
workspace_layout { return TOK_WORKSPACE_LAYOUT; }
|
||||||
new_window { return TOKNEWWINDOW; }
|
new_window { return TOKNEWWINDOW; }
|
||||||
|
new_float { return TOKNEWFLOAT; }
|
||||||
normal { return TOK_NORMAL; }
|
normal { return TOK_NORMAL; }
|
||||||
none { return TOK_NONE; }
|
none { return TOK_NONE; }
|
||||||
1pixel { return TOK_1PIXEL; }
|
1pixel { return TOK_1PIXEL; }
|
||||||
|
|
|
@ -579,6 +579,7 @@ void parse_file(const char *f) {
|
||||||
%token TOK_AUTO "auto"
|
%token TOK_AUTO "auto"
|
||||||
%token TOK_WORKSPACE_LAYOUT "workspace_layout"
|
%token TOK_WORKSPACE_LAYOUT "workspace_layout"
|
||||||
%token TOKNEWWINDOW "new_window"
|
%token TOKNEWWINDOW "new_window"
|
||||||
|
%token TOKNEWFLOAT "new_float"
|
||||||
%token TOK_NORMAL "normal"
|
%token TOK_NORMAL "normal"
|
||||||
%token TOK_NONE "none"
|
%token TOK_NONE "none"
|
||||||
%token TOK_1PIXEL "1pixel"
|
%token TOK_1PIXEL "1pixel"
|
||||||
|
@ -610,6 +611,7 @@ void parse_file(const char *f) {
|
||||||
%type <number> layout_mode
|
%type <number> layout_mode
|
||||||
%type <number> border_style
|
%type <number> border_style
|
||||||
%type <number> new_window
|
%type <number> new_window
|
||||||
|
%type <number> new_float
|
||||||
%type <number> colorpixel
|
%type <number> colorpixel
|
||||||
%type <number> bool
|
%type <number> bool
|
||||||
%type <number> popup_setting
|
%type <number> popup_setting
|
||||||
|
@ -634,6 +636,7 @@ line:
|
||||||
| orientation
|
| orientation
|
||||||
| workspace_layout
|
| workspace_layout
|
||||||
| new_window
|
| new_window
|
||||||
|
| new_float
|
||||||
| focus_follows_mouse
|
| focus_follows_mouse
|
||||||
| force_focus_wrapping
|
| force_focus_wrapping
|
||||||
| workspace_bar
|
| workspace_bar
|
||||||
|
@ -924,6 +927,14 @@ new_window:
|
||||||
}
|
}
|
||||||
;
|
;
|
||||||
|
|
||||||
|
new_float:
|
||||||
|
TOKNEWFLOAT border_style
|
||||||
|
{
|
||||||
|
DLOG("new floating windows should start with border style %d\n", $2);
|
||||||
|
config.default_floating_border = $2;
|
||||||
|
}
|
||||||
|
;
|
||||||
|
|
||||||
border_style:
|
border_style:
|
||||||
TOK_NORMAL { $$ = BS_NORMAL; }
|
TOK_NORMAL { $$ = BS_NORMAL; }
|
||||||
| TOK_NONE { $$ = BS_NONE; }
|
| TOK_NONE { $$ = BS_NONE; }
|
||||||
|
|
|
@ -333,6 +333,7 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath,
|
||||||
INIT_COLOR(config.bar.urgent, "#2f343a", "#900000", "#ffffff");
|
INIT_COLOR(config.bar.urgent, "#2f343a", "#900000", "#ffffff");
|
||||||
|
|
||||||
config.default_border = BS_NORMAL;
|
config.default_border = BS_NORMAL;
|
||||||
|
config.default_floating_border = BS_NORMAL;
|
||||||
/* Set default_orientation to NO_ORIENTATION for auto orientation. */
|
/* Set default_orientation to NO_ORIENTATION for auto orientation. */
|
||||||
config.default_orientation = NO_ORIENTATION;
|
config.default_orientation = NO_ORIENTATION;
|
||||||
|
|
||||||
|
|
|
@ -129,6 +129,10 @@ void floating_enable(Con *con, bool automatic) {
|
||||||
con->percent = 1.0;
|
con->percent = 1.0;
|
||||||
con->floating = FLOATING_USER_ON;
|
con->floating = FLOATING_USER_ON;
|
||||||
|
|
||||||
|
/* 4: set the border style as specified with new_float */
|
||||||
|
if (automatic)
|
||||||
|
con->border_style = config.default_floating_border;
|
||||||
|
|
||||||
/* Some clients (like GIMP’s color picker window) get mapped
|
/* Some clients (like GIMP’s color picker window) get mapped
|
||||||
* to (0, 0), so we push them to a reasonable position
|
* to (0, 0), so we push them to a reasonable position
|
||||||
* (centered over their leader) */
|
* (centered over their leader) */
|
||||||
|
|
Loading…
Reference in New Issue