brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf-helper: Allow creating window with text input

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2722>
This commit is contained in:
Jonas Ådahl 2023-03-24 11:26:05 +01:00
parent d272b16e50
commit 1da8df81c5
3 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/dbus-interfaces/org.gnome.Shell.PerfHelper.xml
View File

@ -7,6 +7,7 @@
<arg type="b" direction="in"/> <arg type="b" direction="in"/>
<arg type="b" direction="in"/> <arg type="b" direction="in"/>
<arg type="b" direction="in"/> <arg type="b" direction="in"/>
<arg type="b" direction="in"/>
</method> </method>
<method name="WaitWindows"/> <method name="WaitWindows"/>
<method name="DestroyWindows"/> <method name="DestroyWindows"/>

4
js/ui/scripting.js
View File

@ -107,12 +107,14 @@ function createTestWindow(params) {
alpha: false, alpha: false,
maximized: false, maximized: false,
redraws: false, redraws: false,
textInput: false,
}); });
let perfHelper = _getPerfHelper(); let perfHelper = _getPerfHelper();
perfHelper.CreateWindowAsync( perfHelper.CreateWindowAsync(
params.width, params.height, params.width, params.height,
params.alpha, params.maximized, params.redraws).catch(logError); params.alpha, params.maximized,
params.redraws, params.textInput).catch(logError);
} }
/** /**

55
src/shell-perf-helper.c
View File

@ -29,6 +29,7 @@ static const gchar introspection_xml[] =
" <arg type='b' name='alpha' direction='in'/>" " <arg type='b' name='alpha' direction='in'/>"
" <arg type='b' name='maximized' direction='in'/>" " <arg type='b' name='maximized' direction='in'/>"
" <arg type='b' name='redraws' direction='in'/>" " <arg type='b' name='redraws' direction='in'/>"
" <arg type='b' name='text_input' direction='in'/>"
" </method>" " </method>"
" <method name='WaitWindows'/>" " <method name='WaitWindows'/>"
" <method name='DestroyWindows'/>" " <method name='DestroyWindows'/>"
@ -111,6 +112,22 @@ on_window_map_event (GtkWidget *window,
return FALSE; return FALSE;
} }
static gboolean
on_window_draw (GtkWidget *window,
cairo_t *cr,
WindowInfo *info)
{
info->exposed = TRUE;
if (info->exposed && info->mapped && info->pending)
{
info->pending = FALSE;
check_finish_wait_windows ();
}
return FALSE;
}
static gboolean static gboolean
on_child_draw (GtkWidget *window, on_child_draw (GtkWidget *window,
cairo_t *cr, cairo_t *cr,
@ -160,14 +177,6 @@ on_child_draw (GtkWidget *window,
cairo_line_to (cr, allocation.width - 40 + x_offset, allocation.height); cairo_line_to (cr, allocation.width - 40 + x_offset, allocation.height);
cairo_stroke (cr); cairo_stroke (cr);
info->exposed = TRUE;
if (info->exposed && info->mapped && info->pending)
{
info->pending = FALSE;
check_finish_wait_windows ();
}
return FALSE; return FALSE;
} }
@ -193,7 +202,8 @@ create_window (int width,
int height, int height,
gboolean alpha, gboolean alpha,
gboolean maximized, gboolean maximized,
gboolean redraws) gboolean redraws,
gboolean text_input)
{ {
WindowInfo *info; WindowInfo *info;
GtkWidget *child; GtkWidget *child;
@ -212,13 +222,24 @@ create_window (int width,
info->pending = TRUE; info->pending = TRUE;
info->start_time = -1; info->start_time = -1;
child = g_object_new (GTK_TYPE_BOX, "visible", TRUE, "app-paintable", TRUE, NULL); if (text_input)
{
child = gtk_entry_new ();
gtk_widget_show (child);
}
else
{
child = g_object_new (GTK_TYPE_BOX, "visible", TRUE, "app-paintable", TRUE, NULL);
gtk_widget_set_app_paintable (info->window, TRUE);
g_signal_connect (child, "draw", G_CALLBACK (on_child_draw), info);
}
gtk_container_add (GTK_CONTAINER (info->window), child); gtk_container_add (GTK_CONTAINER (info->window), child);
gtk_widget_set_size_request (info->window, width, height); g_signal_connect (info->window, "draw", G_CALLBACK (on_window_draw), info);
gtk_widget_set_app_paintable (info->window, TRUE);
g_signal_connect (info->window, "map-event", G_CALLBACK (on_window_map_event), info); g_signal_connect (info->window, "map-event", G_CALLBACK (on_window_map_event), info);
g_signal_connect (child, "draw", G_CALLBACK (on_child_draw), info);
gtk_widget_set_size_request (info->window, width, height);
gtk_widget_show (info->window); gtk_widget_show (info->window);
if (info->redraws) if (info->redraws)
@ -282,11 +303,13 @@ handle_method_call (GDBusConnection *connection,
else if (g_strcmp0 (method_name, "CreateWindow") == 0) else if (g_strcmp0 (method_name, "CreateWindow") == 0)
{ {
int width, height; int width, height;
gboolean alpha, maximized, redraws; gboolean alpha, maximized, redraws, text_input;
g_variant_get (parameters, "(iibbb)", &width, &height, &alpha, &maximized, &redraws); g_variant_get (parameters, "(iibbbb)",
&width, &height,
&alpha, &maximized, &redraws, &text_input);
create_window (width, height, alpha, maximized, redraws); create_window (width, height, alpha, maximized, redraws, text_input);
g_dbus_method_invocation_return_value (invocation, NULL); g_dbus_method_invocation_return_value (invocation, NULL);
} }
else if (g_strcmp0 (method_name, "WaitWindows") == 0) else if (g_strcmp0 (method_name, "WaitWindows") == 0)