Let clients override the suggested size on resize.
This lets gears enforce a square aspect ration and minimum size of 300x300 and the terminal now properly resizes in steps of character cells.
This commit is contained in:
Kristian Høgsberg
parent
1584c57edc
commit
221067654c
15
gears.c
15
gears.c
|
|
@ -243,8 +243,19 @@ draw_gears(struct gears *gears)
|
|||
static void
|
||||
resize_window(struct gears *gears)
|
||||
{
|
||||
window_draw(gears->window);
|
||||
/* Constrain child size to be square and at least 300x300 */
|
||||
window_get_child_rectangle(gears->window, &gears->rectangle);
|
||||
if (gears->rectangle.width > gears->rectangle.height)
|
||||
gears->rectangle.height = gears->rectangle.width;
|
||||
else
|
||||
gears->rectangle.width = gears->rectangle.height;
|
||||
if (gears->rectangle.width < 300) {
|
||||
gears->rectangle.width = 300;
|
||||
gears->rectangle.height = 300;
|
||||
}
|
||||
window_set_child_size(gears->window, &gears->rectangle);
|
||||
|
||||
window_draw(gears->window);
|
||||
|
||||
if (gears->buffer != NULL)
|
||||
buffer_destroy(gears->buffer, gears->fd);
|
||||
|
|
@ -269,7 +280,7 @@ resize_window(struct gears *gears)
|
|||
}
|
||||
|
||||
static void
|
||||
resize_handler(struct window *window, struct rectangle *rectangle, void *data)
|
||||
resize_handler(struct window *window, void *data)
|
||||
{
|
||||
struct gears *gears = data;
|
||||
|
||||
|
|
|
|||
108
terminal.c
108
terminal.c
|
|
@ -66,6 +66,55 @@ struct terminal {
|
|||
int margin;
|
||||
};
|
||||
|
||||
static void
|
||||
terminal_resize(struct terminal *terminal, int width, int height)
|
||||
{
|
||||
size_t size;
|
||||
char *data;
|
||||
int i, l, total_rows, row, tail;
|
||||
|
||||
if (terminal->width == width && terminal->height == height)
|
||||
return;
|
||||
|
||||
size = (width + 1) * height;
|
||||
data = malloc(size);
|
||||
memset(data, 0, size);
|
||||
if (terminal->data) {
|
||||
if (width > terminal->width)
|
||||
l = terminal->width;
|
||||
else
|
||||
l = width;
|
||||
|
||||
if (terminal->total_rows > height) {
|
||||
total_rows = height;
|
||||
tail = terminal->tail + terminal->total_rows - height;
|
||||
} else {
|
||||
total_rows = terminal->total_rows;
|
||||
tail = terminal->tail;
|
||||
}
|
||||
|
||||
for (i = 0; i < total_rows; i++) {
|
||||
row = (tail + i) % terminal->height;
|
||||
memcpy(data + (width + 1) * i,
|
||||
&terminal->data[row * (terminal->width + 1)], l);
|
||||
}
|
||||
|
||||
free(terminal->data);
|
||||
} else {
|
||||
total_rows = 1;
|
||||
}
|
||||
|
||||
terminal->width = width;
|
||||
terminal->height = height;
|
||||
terminal->data = data;
|
||||
|
||||
terminal->total_rows = total_rows;
|
||||
terminal->row = total_rows - 1;
|
||||
if (terminal->column >= terminal->width)
|
||||
terminal->column = terminal->width - 1;
|
||||
terminal->tail = 0;
|
||||
}
|
||||
|
||||
static void
|
||||
terminal_draw_contents(struct terminal *terminal)
|
||||
{
|
||||
|
|
@ -111,6 +160,33 @@ terminal_draw_contents(struct terminal *terminal)
|
|||
static void
|
||||
terminal_draw(struct terminal *terminal)
|
||||
{
|
||||
struct rectangle rectangle;
|
||||
cairo_surface_t *surface;
|
||||
cairo_font_extents_t extents;
|
||||
cairo_t *cr;
|
||||
int width, height;
|
||||
|
||||
window_get_child_rectangle(terminal->window, &rectangle);
|
||||
|
||||
surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 0, 0);
|
||||
cr = cairo_create(surface);
|
||||
cairo_select_font_face (cr, "mono",
|
||||
CAIRO_FONT_SLANT_NORMAL,
|
||||
CAIRO_FONT_WEIGHT_NORMAL);
|
||||
cairo_set_font_size(cr, 14);
|
||||
cairo_font_extents(cr, &extents);
|
||||
cairo_destroy(cr);
|
||||
cairo_surface_destroy(surface);
|
||||
|
||||
width = (rectangle.width - 2 * terminal->margin) / (int32_t) extents.max_x_advance;
|
||||
height = (rectangle.height - 2 * terminal->margin) / (int32_t) extents.height;
|
||||
terminal_resize(terminal, width, height);
|
||||
|
||||
rectangle.width = terminal->width * extents.max_x_advance + 2 * terminal->margin;
|
||||
rectangle.height = terminal->height * extents.height + 2 * terminal->margin;
|
||||
|
||||
window_set_child_size(terminal->window, &rectangle);
|
||||
|
||||
window_draw(terminal->window);
|
||||
terminal_draw_contents(terminal);
|
||||
wl_display_commit(terminal->display, 0);
|
||||
|
|
@ -234,29 +310,9 @@ terminal_data(struct terminal *terminal, const char *data, size_t length)
|
|||
}
|
||||
|
||||
static void
|
||||
resize_handler(struct window *window, struct rectangle *rectangle, void *data)
|
||||
resize_handler(struct window *window, void *data)
|
||||
{
|
||||
struct terminal *terminal = data;
|
||||
cairo_surface_t *surface;
|
||||
cairo_font_extents_t extents;
|
||||
cairo_t *cr;
|
||||
|
||||
/* Adjust the size to an integer number of character cells.
|
||||
* Maybe this is better done in the redraw path, as we're
|
||||
* creating the cr and setting the font there anyway. */
|
||||
|
||||
surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 0, 0);
|
||||
cr = cairo_create(surface);
|
||||
cairo_select_font_face (cr, "mono",
|
||||
CAIRO_FONT_SLANT_NORMAL,
|
||||
CAIRO_FONT_WEIGHT_NORMAL);
|
||||
cairo_set_font_size(cr, 14);
|
||||
cairo_font_extents(cr, &extents);
|
||||
cairo_destroy(cr);
|
||||
cairo_surface_destroy(surface);
|
||||
|
||||
rectangle->width -= (rectangle->width - 2 * terminal->margin) % (int32_t) extents.max_x_advance;
|
||||
rectangle->height -= (rectangle->height - 2 * terminal->margin) % (int32_t) extents.height;
|
||||
|
||||
terminal_schedule_redraw(terminal);
|
||||
}
|
||||
|
|
@ -390,7 +446,6 @@ static struct terminal *
|
|||
terminal_create(struct wl_display *display, int fd)
|
||||
{
|
||||
struct terminal *terminal;
|
||||
int size;
|
||||
|
||||
terminal = malloc(sizeof *terminal);
|
||||
if (terminal == NULL)
|
||||
|
|
@ -402,18 +457,14 @@ terminal_create(struct wl_display *display, int fd)
|
|||
500, 100, 500, 400);
|
||||
terminal->display = display;
|
||||
terminal->redraw_scheduled = 1;
|
||||
terminal->width = 80;
|
||||
terminal->height = 25;
|
||||
terminal->total_rows = 1;
|
||||
terminal->margin = 5;
|
||||
size = (terminal->width + 1) * terminal->height;
|
||||
terminal->data = malloc(size);
|
||||
memset(terminal->data, 0, size);
|
||||
|
||||
window_set_resize_handler(terminal->window, resize_handler, terminal);
|
||||
window_set_acknowledge_handler(terminal->window, acknowledge_handler, terminal);
|
||||
window_set_key_handler(terminal->window, key_handler, terminal);
|
||||
|
||||
terminal_draw(terminal);
|
||||
|
||||
return terminal;
|
||||
}
|
||||
|
||||
|
|
@ -486,7 +537,6 @@ int main(int argc, char *argv[])
|
|||
|
||||
terminal = terminal_create(display, fd);
|
||||
terminal_run(terminal, "/bin/bash");
|
||||
terminal_draw(terminal);
|
||||
|
||||
g_main_loop_run(loop);
|
||||
|
||||
|
|
|
|||
16
window.c
16
window.c
|
|
@ -247,20 +247,12 @@ event_handler(struct wl_display *display,
|
|||
case WINDOW_RESIZING_LOWER_RIGHT:
|
||||
window->width = window->drag_x + x;
|
||||
window->height = window->drag_y + y;
|
||||
if (window->width < window->minimum_width)
|
||||
window->width = window->minimum_width;
|
||||
if (window->height < window->minimum_height)
|
||||
window->height = window->minimum_height;
|
||||
|
||||
window_get_child_rectangle(window, &rectangle);
|
||||
if (window->resize_handler)
|
||||
(*window->resize_handler)(window,
|
||||
&rectangle,
|
||||
window->user_data);
|
||||
|
||||
window->width = rectangle.width + 20;
|
||||
window->height = rectangle.height + 60;
|
||||
|
||||
break;
|
||||
}
|
||||
} else if (opcode == 1) {
|
||||
|
|
@ -316,6 +308,14 @@ window_get_child_rectangle(struct window *window,
|
|||
rectangle->height = window->height - 60;
|
||||
}
|
||||
|
||||
void
|
||||
window_set_child_size(struct window *window,
|
||||
struct rectangle *rectangle)
|
||||
{
|
||||
window->width = rectangle->width + 20;
|
||||
window->height = rectangle->height + 60;
|
||||
}
|
||||
|
||||
void
|
||||
window_copy(struct window *window,
|
||||
struct rectangle *rectangle,
|
||||
|
|
|
|||
5
window.h
5
window.h
|
|
@ -32,7 +32,7 @@ struct rectangle {
|
|||
int32_t height;
|
||||
};
|
||||
|
||||
typedef void (*window_resize_handler_t)(struct window *window, struct rectangle *rectangle, void *data);
|
||||
typedef void (*window_resize_handler_t)(struct window *window, void *data);
|
||||
typedef void (*window_frame_handler_t)(struct window *window, uint32_t frame, uint32_t timestamp, void *data);
|
||||
typedef void (*window_acknowledge_handler_t)(struct window *window, uint32_t key, void *data);
|
||||
typedef void (*window_key_handler_t)(struct window *window, uint32_t key, uint32_t state, void *data);
|
||||
|
|
@ -52,6 +52,9 @@ void
|
|||
window_get_child_rectangle(struct window *window,
|
||||
struct rectangle *rectangle);
|
||||
void
|
||||
window_set_child_size(struct window *window,
|
||||
struct rectangle *rectangle);
|
||||
void
|
||||
window_copy(struct window *window,
|
||||
struct rectangle *rectangle,
|
||||
uint32_t name, uint32_t stride);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user