nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-30 19:12:48 -05:00
Code Issues Projects Releases Wiki Activity

Flip direction of window pos/size queries.

Browse Source 
Similarly to other recent changes, the frontend now proactively keeps
Terminal up to date with the current position and size of the terminal
window, so that escape-sequence queries can be answered immediately
from the Terminal's own internal data structures without needing a
call back to the frontend.

Mostly this has let me remove explicit window-system API calls that
retrieve the window position and size, in favour of having the front
ends listen for WM_MOVE / WM_SIZE / ConfigureNotify events and track
the position and size that way. One exception is that the window pixel
size is still requested by Seat via a callback, to put in the
wire-encoded termios settings. That won't be happening very much, so
I'm leaving it this way round for the moment.
This commit is contained in:
Simon Tatham
2021-02-07 19:59:21 +00:00
parent ca9cd983e1
commit 696550a5f2
6 changed files with 70 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
unix/gtkwin.c
View File

@ -350,7 +350,16 @@ static bool gtk_seat_is_utf8(Seat *seat)
static bool gtk_seat_get_window_pixel_size(Seat *seat, int *w, int *h)
{
GtkFrontend *inst = container_of(seat, GtkFrontend, seat);
win_get_pixels(&inst->termwin, w, h);
/*
* I assume that when the GTK version of this call is available
* we should use it. Not sure how it differs from the GDK one,
* though.
*/
#if GTK_CHECK_VERSION(2,0,0)
gtk_window_get_size(GTK_WINDOW(inst->window), w, h);
#else
gdk_window_get_size(gtk_widget_get_window(inst->window), w, h);
#endif
return true;
}
@ -561,42 +570,6 @@ static void gtkwin_set_maximised(TermWin *tw, bool maximised)
#endif
}
/*
* Report the window's position, for terminal reports.
*/
static void gtkwin_get_pos(TermWin *tw, int *x, int *y)
{
GtkFrontend *inst = container_of(tw, GtkFrontend, termwin);
/*
* I assume that when the GTK version of this call is available
* we should use it. Not sure how it differs from the GDK one,
* though.
*/
#if GTK_CHECK_VERSION(2,0,0)
gtk_window_get_position(GTK_WINDOW(inst->window), x, y);
#else
gdk_window_get_position(gtk_widget_get_window(inst->window), x, y);
#endif
}
/*
* Report the window's pixel size, for terminal reports.
*/
static void gtkwin_get_pixels(TermWin *tw, int *x, int *y)
{
GtkFrontend *inst = container_of(tw, GtkFrontend, termwin);
/*
* I assume that when the GTK version of this call is available
* we should use it. Not sure how it differs from the GDK one,
* though.
*/
#if GTK_CHECK_VERSION(2,0,0)
gtk_window_get_size(GTK_WINDOW(inst->window), x, y);
#else
gdk_window_get_size(gtk_widget_get_window(inst->window), x, y);
#endif
}
/*
* Find out whether a dialog box already exists for this window in a
* particular DialogSlot. If it does, uniconify it (if we can) and
@ -842,6 +815,18 @@ static void area_check_scale(GtkFrontend *inst)
}
#endif
static gboolean window_configured(
GtkWidget *widget, GdkEventConfigure *event, gpointer data)
{
GtkFrontend *inst = (GtkFrontend *)data;
if (inst->term) {
term_notify_window_pos(inst->term, event->x, event->y);
term_notify_window_size_pixels(
inst->term, event->width, event->height);
}
return false;
}
#if GTK_CHECK_VERSION(3,10,0)
static gboolean area_configured(
GtkWidget *widget, GdkEventConfigure *event, gpointer data)
@ -5053,8 +5038,6 @@ static const TermWinVtable gtk_termwin_vt = {
.set_zorder = gtkwin_set_zorder,
.palette_set = gtkwin_palette_set,
.palette_get_overrides = gtkwin_palette_get_overrides,
.get_pos = gtkwin_get_pos,
.get_pixels = gtkwin_get_pixels,
};
void new_session_window(Conf *conf, const char *geometry_string)
@ -5263,6 +5246,8 @@ void new_session_window(Conf *conf, const char *geometry_string)
G_CALLBACK(area_realised), inst);
g_signal_connect(G_OBJECT(inst->area), "size_allocate",
G_CALLBACK(area_size_allocate), inst);
g_signal_connect(G_OBJECT(inst->window), "configure_event",
G_CALLBACK(window_configured), inst);
#if GTK_CHECK_VERSION(3,10,0)
g_signal_connect(G_OBJECT(inst->area), "configure_event",
G_CALLBACK(area_configured), inst);