mirror of
https://github.com/fltk/fltk.git
synced 2026-05-31 22:04:26 +08:00
Libdecor: update to upstream commit 25f29fef 3 dec 2022
This commit is contained in:
@@ -1397,8 +1397,11 @@ check_symbol_conflicts(const struct libdecor_plugin_description *plugin_descript
|
|||||||
while (*symbol) {
|
while (*symbol) {
|
||||||
dlerror();
|
dlerror();
|
||||||
dlsym (RTLD_DEFAULT, *symbol);
|
dlsym (RTLD_DEFAULT, *symbol);
|
||||||
if (!dlerror())
|
if (!dlerror()) {
|
||||||
|
fprintf(stderr, "Plugin \"%s\" uses conflicting symbol \"%s\".\n",
|
||||||
|
plugin_description->description, *symbol);
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
symbol++;
|
symbol++;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -454,8 +454,8 @@ libdecor_frame_gtk_new(struct libdecor_plugin_gtk *plugin_gtk)
|
|||||||
cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
|
cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
|
||||||
cairo_set_source_rgba(cr, 0, 0, 0, 1);
|
cairo_set_source_rgba(cr, 0, 0, 0, 1);
|
||||||
cairo_rectangle(cr, boundary, boundary,
|
cairo_rectangle(cr, boundary, boundary,
|
||||||
size - 2 * boundary,
|
size - 2 * boundary,
|
||||||
size - 2 * boundary);
|
size - 2 * boundary);
|
||||||
cairo_fill(cr);
|
cairo_fill(cr);
|
||||||
cairo_destroy(cr);
|
cairo_destroy(cr);
|
||||||
blur_surface(frame_gtk->shadow_blur, 64);
|
blur_surface(frame_gtk->shadow_blur, 64);
|
||||||
@@ -659,6 +659,7 @@ libdecor_plugin_gtk_frame_free(struct libdecor_plugin *plugin,
|
|||||||
/* when in SSD mode, frame_gtk->header is not a proper GTK widget */
|
/* when in SSD mode, frame_gtk->header is not a proper GTK widget */
|
||||||
if (!GTK_IS_WIDGET(frame_gtk->header)) return;
|
if (!GTK_IS_WIDGET(frame_gtk->header)) return;
|
||||||
gtk_widget_destroy(frame_gtk->header);
|
gtk_widget_destroy(frame_gtk->header);
|
||||||
|
if (!GTK_IS_WIDGET(frame_gtk->window)) return;
|
||||||
gtk_widget_destroy(frame_gtk->window);
|
gtk_widget_destroy(frame_gtk->window);
|
||||||
|
|
||||||
free_border_component(&frame_gtk->headerbar);
|
free_border_component(&frame_gtk->headerbar);
|
||||||
@@ -1519,7 +1520,7 @@ libdecor_plugin_gtk_frame_property_changed(struct libdecor_plugin *plugin,
|
|||||||
* when in SSD mode, the window title is not to be managed by GTK;
|
* when in SSD mode, the window title is not to be managed by GTK;
|
||||||
* this is detected by frame_gtk->header not being a proper GTK widget
|
* this is detected by frame_gtk->header not being a proper GTK widget
|
||||||
*/
|
*/
|
||||||
if (!GTK_IS_WIDGET(frame_gtk->header)) return;
|
if (!GTK_IS_WIDGET(frame_gtk->header)) return;
|
||||||
|
|
||||||
new_title = libdecor_frame_get_title(frame);
|
new_title = libdecor_frame_get_title(frame);
|
||||||
if (!streq(frame_gtk->title, new_title))
|
if (!streq(frame_gtk->title, new_title))
|
||||||
@@ -2220,11 +2221,11 @@ pointer_button(void *data,
|
|||||||
toggle_maximized(&frame_gtk->frame);
|
toggle_maximized(&frame_gtk->frame);
|
||||||
break;
|
break;
|
||||||
case HEADER_CLOSE:
|
case HEADER_CLOSE:
|
||||||
if (closeable(frame_gtk)) {
|
if (closeable(frame_gtk)) {
|
||||||
libdecor_frame_close(
|
libdecor_frame_close(
|
||||||
&frame_gtk->frame);
|
&frame_gtk->frame);
|
||||||
seat->pointer_focus = NULL;
|
seat->pointer_focus = NULL;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
@@ -2297,7 +2298,7 @@ seat_name(void *data,
|
|||||||
{
|
{
|
||||||
/* avoid warning messages when opening/closing popup window */
|
/* avoid warning messages when opening/closing popup window */
|
||||||
struct seat *seat = (struct seat*)data;
|
struct seat *seat = (struct seat*)data;
|
||||||
seat->name = strdup(name);
|
seat->name = strdup(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct wl_seat_listener seat_listener = {
|
static struct wl_seat_listener seat_listener = {
|
||||||
|
|||||||
Reference in New Issue
Block a user