nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1880 from Airblader/feature-665 

Move data from Con to Window
This commit is contained in:
Michael Stapelberg 2015-09-03 20:35:43 +02:00
parent 394161c479 344514bca5
commit ee2983c791
6 changed files with 54 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/data.h
View File

@ -409,6 +409,18 @@ struct Window {
/** Depth of the window */ /** Depth of the window */
uint16_t depth; uint16_t depth;
/* the wanted size of the window, used in combination with size
* increments (see below). */
int base_width;
int base_height;
/* minimum increment size specified for the window (in pixels) */
int width_increment;
int height_increment;
/* aspect ratio from WM_NORMAL_HINTS (MPlayer uses this for example) */
double aspect_ratio;
}; };
/** /**
@ -570,21 +582,10 @@ struct Con {
double percent; double percent;
/* aspect ratio from WM_NORMAL_HINTS (MPlayer uses this for example) */
double aspect_ratio;
/* the wanted size of the window, used in combination with size
* increments (see below). */
int base_width;
int base_height;
/* the x11 border pixel attribute */ /* the x11 border pixel attribute */
int border_width; int border_width;
int current_border_width; int current_border_width;
/* minimum increment size specified for the window (in pixels) */
int width_increment;
int height_increment;
struct Window *window; struct Window *window;
/* timer used for disabling urgency */ /* timer used for disabling urgency */

25
src/commands.c
View File

@ -599,17 +599,20 @@ static void cmd_resize_floating(I3_CMD, char *way, char *direction, Con *floatin
/* ensure that resize will take place even if pixel increment is smaller than /* ensure that resize will take place even if pixel increment is smaller than
* height increment or width increment. * height increment or width increment.
* fixes #1011 */ * fixes #1011 */
if (strcmp(direction, "up") == 0 || strcmp(direction, "down") == 0 || const i3Window *window = focused_con->window;
strcmp(direction, "height") == 0) { if (window != NULL) {
if (px < 0) if (strcmp(direction, "up") == 0 || strcmp(direction, "down") == 0 ||
px = (-px < focused_con->height_increment) ? -focused_con->height_increment : px; strcmp(direction, "height") == 0) {
else if (px < 0)
px = (px < focused_con->height_increment) ? focused_con->height_increment : px; px = (-px < window->height_increment) ? -window->height_increment : px;
} else if (strcmp(direction, "left") == 0 || strcmp(direction, "right") == 0) { else
if (px < 0) px = (px < window->height_increment) ? window->height_increment : px;
px = (-px < focused_con->width_increment) ? -focused_con->width_increment : px; } else if (strcmp(direction, "left") == 0 || strcmp(direction, "right") == 0) {
else if (px < 0)
px = (px < focused_con->width_increment) ? focused_con->width_increment : px; px = (-px < window->width_increment) ? -window->width_increment : px;
else
px = (px < window->width_increment) ? window->width_increment : px;
}
} }
if (strcmp(direction, "up") == 0) { if (strcmp(direction, "up") == 0) {

7
src/con.c
View File

@ -39,15 +39,16 @@ Con *con_new_skeleton(Con *parent, i3Window *window) {
Con *new = scalloc(1, sizeof(Con)); Con *new = scalloc(1, sizeof(Con));
new->on_remove_child = con_on_remove_child; new->on_remove_child = con_on_remove_child;
TAILQ_INSERT_TAIL(&all_cons, new, all_cons); TAILQ_INSERT_TAIL(&all_cons, new, all_cons);
new->aspect_ratio = 0.0;
new->type = CT_CON; new->type = CT_CON;
new->window = window; new->window = window;
new->border_style = config.default_border; new->border_style = config.default_border;
new->current_border_width = -1; new->current_border_width = -1;
if (window) if (window) {
new->depth = window->depth; new->depth = window->depth;
else new->window->aspect_ratio = 0.0;
} else {
new->depth = XCB_COPY_FROM_PARENT; new->depth = XCB_COPY_FROM_PARENT;
}
DLOG("opening window\n"); DLOG("opening window\n");
TAILQ_INIT(&(new->floating_head)); TAILQ_INIT(&(new->floating_head));

22
src/floating.c
View File

@ -42,7 +42,7 @@ void floating_check_size(Con *floating_con) {
Con *focused_con = con_descend_focused(floating_con); Con *focused_con = con_descend_focused(floating_con);
/* obey size increments */ /* obey size increments */
if (focused_con->height_increment || focused_con->width_increment) { if (focused_con->window != NULL && (focused_con->window->height_increment || focused_con->window->width_increment)) {
Rect border_rect = con_border_style_rect(focused_con); Rect border_rect = con_border_style_rect(focused_con);
/* We have to do the opposite calculations that render_con() do /* We have to do the opposite calculations that render_con() do
@ -54,18 +54,18 @@ void floating_check_size(Con *floating_con) {
if (con_border_style(focused_con) == BS_NORMAL) if (con_border_style(focused_con) == BS_NORMAL)
border_rect.height += render_deco_height(); border_rect.height += render_deco_height();
if (focused_con->height_increment && if (focused_con->window->height_increment &&
floating_con->rect.height >= focused_con->base_height + border_rect.height) { floating_con->rect.height >= focused_con->window->base_height + border_rect.height) {
floating_con->rect.height -= focused_con->base_height + border_rect.height; floating_con->rect.height -= focused_con->window->base_height + border_rect.height;
floating_con->rect.height -= floating_con->rect.height % focused_con->height_increment; floating_con->rect.height -= floating_con->rect.height % focused_con->window->height_increment;
floating_con->rect.height += focused_con->base_height + border_rect.height; floating_con->rect.height += focused_con->window->base_height + border_rect.height;
} }
if (focused_con->width_increment && if (focused_con->window->width_increment &&
floating_con->rect.width >= focused_con->base_width + border_rect.width) { floating_con->rect.width >= focused_con->window->base_width + border_rect.width) {
floating_con->rect.width -= focused_con->base_width + border_rect.width; floating_con->rect.width -= focused_con->window->base_width + border_rect.width;
floating_con->rect.width -= floating_con->rect.width % focused_con->width_increment; floating_con->rect.width -= floating_con->rect.width % focused_con->window->width_increment;
floating_con->rect.width += focused_con->base_width + border_rect.width; floating_con->rect.width += focused_con->window->base_width + border_rect.width;
} }
} }

20
src/handlers.c
View File

@ -932,13 +932,13 @@ static bool handle_normal_hints(void *data, xcb_connection_t *conn, uint8_t stat
bool changed = false; bool changed = false;
if ((size_hints.flags & XCB_ICCCM_SIZE_HINT_P_RESIZE_INC)) { if ((size_hints.flags & XCB_ICCCM_SIZE_HINT_P_RESIZE_INC)) {
if (size_hints.width_inc > 0 && size_hints.width_inc < 0xFFFF) if (size_hints.width_inc > 0 && size_hints.width_inc < 0xFFFF)
if (con->width_increment != size_hints.width_inc) { if (con->window->width_increment != size_hints.width_inc) {
con->width_increment = size_hints.width_inc; con->window->width_increment = size_hints.width_inc;
changed = true; changed = true;
} }
if (size_hints.height_inc > 0 && size_hints.height_inc < 0xFFFF) if (size_hints.height_inc > 0 && size_hints.height_inc < 0xFFFF)
if (con->height_increment != size_hints.height_inc) { if (con->window->height_increment != size_hints.height_inc) {
con->height_increment = size_hints.height_inc; con->window->height_increment = size_hints.height_inc;
changed = true; changed = true;
} }
@ -960,10 +960,10 @@ static bool handle_normal_hints(void *data, xcb_connection_t *conn, uint8_t stat
base_height = size_hints.min_height; base_height = size_hints.min_height;
} }
if (base_width != con->base_width || if (base_width != con->window->base_width ||
base_height != con->base_height) { base_height != con->window->base_height) {
con->base_width = base_width; con->window->base_width = base_width;
con->base_height = base_height; con->window->base_height = base_height;
DLOG("client's base_height changed to %d\n", base_height); DLOG("client's base_height changed to %d\n", base_height);
DLOG("client's base_width changed to %d\n", base_width); DLOG("client's base_width changed to %d\n", base_width);
changed = true; changed = true;
@ -999,8 +999,8 @@ static bool handle_normal_hints(void *data, xcb_connection_t *conn, uint8_t stat
} else } else
goto render_and_return; goto render_and_return;
if (fabs(con->aspect_ratio - aspect_ratio) > DBL_EPSILON) { if (fabs(con->window->aspect_ratio - aspect_ratio) > DBL_EPSILON) {
con->aspect_ratio = aspect_ratio; con->window->aspect_ratio = aspect_ratio;
changed = true; changed = true;
} }

6
src/render.c
View File

@ -172,14 +172,14 @@ void render_con(Con *con, bool render_fullscreen) {
* Ignoring aspect ratio during fullscreen was necessary to fix MPlayer * Ignoring aspect ratio during fullscreen was necessary to fix MPlayer
* subtitle rendering, see http://bugs.i3wm.org/594 */ * subtitle rendering, see http://bugs.i3wm.org/594 */
if (!render_fullscreen && if (!render_fullscreen &&
con->aspect_ratio > 0.0) { con->window->aspect_ratio > 0.0) {
DLOG("aspect_ratio = %f, current width/height are %d/%d\n", DLOG("aspect_ratio = %f, current width/height are %d/%d\n",
con->aspect_ratio, inset->width, inset->height); con->window->aspect_ratio, inset->width, inset->height);
double new_height = inset->height + 1; double new_height = inset->height + 1;
int new_width = inset->width; int new_width = inset->width;
while (new_height > inset->height) { while (new_height > inset->height) {
new_height = (1.0 / con->aspect_ratio) * new_width; new_height = (1.0 / con->window->aspect_ratio) * new_width;
if (new_height > inset->height) if (new_height > inset->height)
new_width--; new_width--;