Skip to content

feat: Wayland detection, text sizing fix, signal handling #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mg-dev25 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Wayland detection, text sizing fix, signal handling #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/cpicker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@

#include "cpicker.h"

#include <glib/gi18n.h> /* For _() macro */

/* Forward declaration - defined in main.c when building yad */
gboolean yad_check_wayland (void);

/* Weak symbol: if yad_check_wayland doesn't exist (tools build), return FALSE */
#ifdef __GNUC__
gboolean __attribute__((weak)) yad_check_wayland (void) { return FALSE; }
#endif

#define BIG_STEP 20

typedef struct {
Expand Down Expand Up @@ -215,6 +225,15 @@ yad_get_screen_color (GtkWidget *widget)
GdkGrabStatus grab_status;
GdkWindow *window;

/* Color picking doesn't work on Wayland - screen capture and device grab are restricted */
if (yad_check_wayland ())
{
g_printerr (_("WARNING: Color picker is not supported on Wayland.\n"
"Screen capture and pointer grab require X11 or a portal.\n"
"Use GDK_BACKEND=x11 to enable color picking.\n"));
return;
}

gd = g_new0 (GrabData, 1);
gd->color_widget = widget;
gd->time = gtk_get_current_event_time ();
Expand Down
130 changes: 111 additions & 19 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
# include <gdk/gdkx.h>
#endif

#ifdef GDK_WINDOWING_WAYLAND
# include <gdk/gdkwayland.h>
#endif

#include "yad.h"

YadOptions options;
Expand All @@ -53,9 +57,22 @@ static GtkWidget *text = NULL;
static gint ret = YAD_RESPONSE_ESC;

static gboolean is_x11 = FALSE;
static gboolean is_wayland = FALSE;

YadNTabs *tabs;

gboolean
yad_check_x11 (void)
{
return is_x11;
}

gboolean
yad_check_wayland (void)
{
return is_wayland;
}

#ifndef G_OS_WIN32
static void
sa_usr1 (gint sig)
Expand All @@ -74,8 +91,28 @@ sa_usr2 (gint sig)
else
yad_exit (YAD_RESPONSE_CANCEL);
}

static void
sa_term (gint sig)
{
/* Handle SIGTERM/SIGINT for graceful shutdown */
if (options.plug != -1)
gtk_main_quit ();
else
yad_exit (YAD_RESPONSE_CANCEL);
}
#endif

/* Callback to fix text label sizing with line wrap */
static void
text_size_allocate_cb (GtkWidget *w, GtkAllocation *al, gpointer data)
{
/* Set the width request to the allocated width to enable proper line wrapping.
* This prevents GTK from requesting the natural (unwrapped) width which causes
* windows to become excessively large. See issues #107, #140, #32, #297, #300 */
gtk_widget_set_size_request (w, al->width, -1);
}

static gboolean
keys_cb (GtkWidget *w, GdkEventKey *ev, gpointer d)
{
Expand Down Expand Up @@ -221,13 +258,34 @@ create_layout (GtkWidget *dlg)
text = gtk_label_new (NULL);
gtk_widget_set_name (text, "yad-dialog-label");
gtk_label_set_line_wrap (GTK_LABEL (text), TRUE);
gtk_label_set_line_wrap_mode (GTK_LABEL (text), PANGO_WRAP_WORD_CHAR);
gtk_label_set_selectable (GTK_LABEL (text), options.data.selectable_labels);
gtk_widget_set_state_flags (text, GTK_STATE_FLAG_NORMAL, FALSE);
gtk_widget_set_can_focus (text, FALSE);

if (options.data.text_width > 0)
gtk_label_set_width_chars (GTK_LABEL (text), options.data.text_width);

/* Constrain label width when window size is constrained.
* This fixes line wrapping with --width, --height, and --geometry options.
* Using max_width_chars with ellipsize=NONE forces text to wrap instead
* of expanding the window. See issues #107, #140, #32, #297, #300 */
if (options.data.width != -1)
{
/* Approximate chars based on width (assuming ~8px per char average) */
gint max_chars = (options.data.width - 50) / 8;
if (max_chars > 10)
{
gtk_label_set_max_width_chars (GTK_LABEL (text), max_chars);
gtk_label_set_ellipsize (GTK_LABEL (text), PANGO_ELLIPSIZE_NONE);
gtk_widget_set_hexpand (text, FALSE);
}
}

/* Also connect size-allocate for geometry-based constraints */
if (options.data.geometry || options.data.width != -1)
g_signal_connect (G_OBJECT (text), "size-allocate", G_CALLBACK (text_size_allocate_cb), NULL);

/* set label align and justification */
switch (options.data.text_align)
{
Expand Down Expand Up @@ -371,28 +429,38 @@ realize_cb (GtkWidget *dlg, gpointer d)

if (options.data.use_posx || options.data.use_posy)
{
gint ww, wh, sw, sh;
gtk_window_get_size (GTK_WINDOW (dlg), &ww, &wh);
gdk_window_get_geometry (gdk_get_default_root_window (), NULL, NULL, &sw, &sh);
/* place window to specified coordinates */
if (!options.data.use_posx)
gtk_window_get_position (GTK_WINDOW (dlg), &options.data.posx, NULL);
if (!options.data.use_posy)
gtk_window_get_position (GTK_WINDOW (dlg), NULL, &options.data.posy);
if (options.data.negx)
/* Window positioning doesn't work reliably on Wayland - compositor controls placement */
if (is_wayland)
{
options.data.posx = sw - ww + options.data.posx;
gravity = GDK_GRAVITY_NORTH_EAST;
if (options.debug)
g_printerr (_("WARNING: Window positioning (--posx/--posy) is controlled by "
"the Wayland compositor and may not work as expected.\n"));
}
if (options.data.negy)
else
{
options.data.posy = sh - wh + options.data.posy;
gravity = GDK_GRAVITY_SOUTH_WEST;
gint ww, wh, sw, sh;
gtk_window_get_size (GTK_WINDOW (dlg), &ww, &wh);
gdk_window_get_geometry (gdk_get_default_root_window (), NULL, NULL, &sw, &sh);
/* place window to specified coordinates */
if (!options.data.use_posx)
gtk_window_get_position (GTK_WINDOW (dlg), &options.data.posx, NULL);
if (!options.data.use_posy)
gtk_window_get_position (GTK_WINDOW (dlg), NULL, &options.data.posy);
if (options.data.negx)
{
options.data.posx = sw - ww + options.data.posx;
gravity = GDK_GRAVITY_NORTH_EAST;
}
if (options.data.negy)
{
options.data.posy = sh - wh + options.data.posy;
gravity = GDK_GRAVITY_SOUTH_WEST;
}
if (options.data.negx && options.data.negy)
gravity = GDK_GRAVITY_SOUTH_EAST;
gtk_window_set_gravity (GTK_WINDOW (dlg), gravity);
gtk_window_move (GTK_WINDOW (dlg), options.data.posx, options.data.posy);
}
if (options.data.negx && options.data.negy)
gravity = GDK_GRAVITY_SOUTH_EAST;
gtk_window_set_gravity (GTK_WINDOW (dlg), gravity);
gtk_window_move (GTK_WINDOW (dlg), options.data.posx, options.data.posy);
}
}

Expand Down Expand Up @@ -438,7 +506,13 @@ create_dialog (void)
if (options.data.center)
gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER_ALWAYS);
else if (options.data.mouse)
gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE);
{
/* Mouse positioning doesn't work on Wayland */
if (is_wayland && options.debug)
g_printerr (_("WARNING: --mouse option is not supported on Wayland.\n"));
else
gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE);
}
}

/* set window behavior */
Expand Down Expand Up @@ -593,6 +667,17 @@ create_dialog (void)
}
}
/* add buttons box to main window */

// Check for footer widget from form
GtkWidget *footer_widget = g_object_get_data (G_OBJECT (dlg), "yad-footer-widget");
if (footer_widget)
{
gtk_box_pack_start (GTK_BOX (bbox), footer_widget, FALSE, FALSE, 0);
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (bbox), footer_widget, TRUE);
gtk_button_box_set_child_non_homogeneous (GTK_BUTTON_BOX (bbox), footer_widget, TRUE);
gtk_widget_show_all (footer_widget);
}

gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
}

Expand Down Expand Up @@ -807,6 +892,11 @@ main (gint argc, gchar ** argv)
is_x11 = TRUE;
#endif

#ifdef GDK_WINDOWING_WAYLAND
if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ()))
is_wayland = TRUE;
#endif

/* parse custom css */
if (options.css)
{
Expand Down Expand Up @@ -890,6 +980,8 @@ main (gint argc, gchar ** argv)
/* set signal handlers */
signal (SIGUSR1, sa_usr1);
signal (SIGUSR2, sa_usr2);
signal (SIGTERM, sa_term);
signal (SIGINT, sa_term);
#endif

if (!is_x11 && options.plug != -1)
Expand Down
6 changes: 5 additions & 1 deletion src/print.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,11 @@ yad_print_run (void)
if (options.data.center)
gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER);
else if (options.data.mouse)
gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE);
{
/* Mouse positioning doesn't work on Wayland */
if (!yad_check_wayland ())
gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE);
}

/* create yad's top box */
if (options.data.dialog_text || options.data.dialog_image)
Expand Down
3 changes: 3 additions & 0 deletions src/yad.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,6 +751,9 @@ YadSearchBar *create_search_bar ();

gboolean yad_confirm_dlg (GtkWindow *parent, gchar *txt);

gboolean yad_check_x11 (void);
gboolean yad_check_wayland (void);

static inline void
strip_new_line (gchar * str)
{
Expand Down