mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

terminal: Show character grid size in header bar when resizing

Browse Source 
We don't have a reliable way to know when to clear this indicator.
Typically the pointer will still be over the window when the resize is
done and we'll get an enter event, but if the window sets a max size
the pointer may be over another window when the resize is done.

We'll need a new wl_shell (or more likely xdg_shell) event for this.
This commit is contained in:
Kristian Høgsberg
2013-10-23 20:47:35 -07:00
parent 67b8215bcb
commit a83be20d7f
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/terminal.c
+15 -2
View File
@@ -428,6 +428,7 @@ struct terminal {
struct window *window; struct window *window;
struct widget *widget; struct widget *widget;
struct display *display; struct display *display;
char *title;
union utf8_char *data; union utf8_char *data;
struct task io_task; struct task io_task;
char *tab_ruler; char *tab_ruler;
@@ -837,7 +838,7 @@ resize_handler(struct widget *widget,
{ {
struct terminal *terminal = data; struct terminal *terminal = data;
int32_t columns, rows, m; int32_t columns, rows, m;
char *p;
m = 2 * terminal->margin; m = 2 * terminal->margin;
columns = (width - m) / (int32_t) terminal->average_width; columns = (width - m) / (int32_t) terminal->average_width;
rows = (height - m) / (int32_t) terminal->extents.height; rows = (height - m) / (int32_t) terminal->extents.height;
@@ -847,6 +848,9 @@ resize_handler(struct widget *widget,
width = columns * terminal->average_width + m; width = columns * terminal->average_width + m;
height = rows * terminal->extents.height + m; height = rows * terminal->extents.height + m;
widget_set_size(terminal->widget, width, height); widget_set_size(terminal->widget, width, height);
asprintf(&p, "%s — [%dx%d]", terminal->title, columns, rows);
window_set_title(terminal->window, p);
free(p);
} }
terminal_resize_cells(terminal, columns, rows); terminal_resize_cells(terminal, columns, rows);
@@ -1257,6 +1261,8 @@ handle_osc(struct terminal *terminal)
case 0: /* Icon name and window title */ case 0: /* Icon name and window title */
case 1: /* Icon label */ case 1: /* Icon label */
case 2: /* Window title*/ case 2: /* Window title*/
free(terminal->title);
terminal->title = strdup(p);
window_set_title(terminal->window, p); window_set_title(terminal->window, p);
break; break;
case 7: /* shell cwd as uri */ case 7: /* shell cwd as uri */
@@ -2725,6 +2731,11 @@ static int
enter_handler(struct widget *widget, enter_handler(struct widget *widget,
struct input *input, float x, float y, void *data) struct input *input, float x, float y, void *data)
{ {
struct terminal *terminal = data;
/* Reset title to get rid of resizing '[WxH]' in titlebar */
window_set_title(terminal->window, terminal->title);
return CURSOR_IBEAM; return CURSOR_IBEAM;
} }
@@ -2776,7 +2787,8 @@ terminal_create(struct display *display)
terminal->margin_bottom = -1; terminal->margin_bottom = -1;
terminal->window = window_create(display); terminal->window = window_create(display);
terminal->widget = window_frame_create(terminal->window, terminal); terminal->widget = window_frame_create(terminal->window, terminal);
window_set_title(terminal->window, "Wayland Terminal"); terminal->title = strdup("Wayland Terminal");
window_set_title(terminal->window, terminal->title);
widget_set_transparent(terminal->widget, 0); widget_set_transparent(terminal->widget, 0);
init_state_machine(&terminal->state_machine); init_state_machine(&terminal->state_machine);
@@ -2851,6 +2863,7 @@ terminal_destroy(struct terminal *terminal)
if (wl_list_empty(&terminal_list)) if (wl_list_empty(&terminal_list))
display_exit(terminal->display); display_exit(terminal->display);
free(terminal->title);
free(terminal); free(terminal);
} }