diff options
| author | Eli Zaretskii | 2025-12-21 08:15:55 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2025-12-21 08:15:55 +0200 |
| commit | 040374be2dd0b601cdd69e2355cb1418b79398f6 (patch) | |
| tree | 95371020d51e8a60a0aa54884aa5f24e8c4111df /src | |
| parent | fd1b5977817e9f05d41d87bc4a31ef5235536d15 (diff) | |
| download | emacs-040374be2dd0b601cdd69e2355cb1418b79398f6.tar.gz emacs-040374be2dd0b601cdd69e2355cb1418b79398f6.zip | |
; Avoid compilation warnings in xwidget.c on macOS
* src/xwidget.c (Fxwidget_perform_lispy_event): Avoid compiler
warnings about set but not used variables. (Bug#80044)
Diffstat (limited to 'src')
| -rw-r--r-- | src/xwidget.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/xwidget.c b/src/xwidget.c index 4f5b46c692a..8b09f24d490 100644 --- a/src/xwidget.c +++ b/src/xwidget.c | |||
| @@ -489,9 +489,8 @@ On X11, modifier keys will not be processed if FRAME is nil and the | |||
| 489 | selected frame is not an X-Windows frame. */) | 489 | selected frame is not an X-Windows frame. */) |
| 490 | (Lisp_Object xwidget, Lisp_Object event, Lisp_Object frame) | 490 | (Lisp_Object xwidget, Lisp_Object event, Lisp_Object frame) |
| 491 | { | 491 | { |
| 492 | struct frame *f = NULL; | ||
| 493 | |||
| 494 | #ifdef USE_GTK | 492 | #ifdef USE_GTK |
| 493 | struct frame *f = NULL; | ||
| 495 | GdkEvent *xg_event; | 494 | GdkEvent *xg_event; |
| 496 | GtkContainerClass *klass; | 495 | GtkContainerClass *klass; |
| 497 | GtkWidget *widget; | 496 | GtkWidget *widget; |
| @@ -504,12 +503,12 @@ selected frame is not an X-Windows frame. */) | |||
| 504 | 503 | ||
| 505 | CHECK_LIVE_XWIDGET (xwidget); | 504 | CHECK_LIVE_XWIDGET (xwidget); |
| 506 | 505 | ||
| 506 | #ifdef USE_GTK | ||
| 507 | if (!NILP (frame)) | 507 | if (!NILP (frame)) |
| 508 | f = decode_window_system_frame (frame); | 508 | f = decode_window_system_frame (frame); |
| 509 | else if (FRAME_WINDOW_P (SELECTED_FRAME ())) | 509 | else if (FRAME_WINDOW_P (SELECTED_FRAME ())) |
| 510 | f = SELECTED_FRAME (); | 510 | f = SELECTED_FRAME (); |
| 511 | 511 | ||
| 512 | #ifdef USE_GTK | ||
| 513 | int character = -1, keycode = -1; | 512 | int character = -1, keycode = -1; |
| 514 | int modifiers = 0; | 513 | int modifiers = 0; |
| 515 | struct xwidget *xw = XXWIDGET (xwidget); | 514 | struct xwidget *xw = XXWIDGET (xwidget); |
| @@ -525,7 +524,7 @@ selected frame is not an X-Windows frame. */) | |||
| 525 | 524 | ||
| 526 | gdk_offscreen_window_set_embedder (osw, embedder); | 525 | gdk_offscreen_window_set_embedder (osw, embedder); |
| 527 | unblock_input (); | 526 | unblock_input (); |
| 528 | #endif | 527 | #endif /* HAVE_XINPUT2 */ |
| 529 | widget = gtk_window_get_focus (GTK_WINDOW (xw->widgetwindow_osr)); | 528 | widget = gtk_window_get_focus (GTK_WINDOW (xw->widgetwindow_osr)); |
| 530 | 529 | ||
| 531 | if (!widget) | 530 | if (!widget) |
| @@ -559,7 +558,7 @@ selected frame is not an X-Windows frame. */) | |||
| 559 | modifiers = pgtk_emacs_to_gtk_modifiers (FRAME_DISPLAY_INFO (f), modifiers); | 558 | modifiers = pgtk_emacs_to_gtk_modifiers (FRAME_DISPLAY_INFO (f), modifiers); |
| 560 | else | 559 | else |
| 561 | modifiers = 0; | 560 | modifiers = 0; |
| 562 | #endif | 561 | #endif /* HAVE_PGTK */ |
| 563 | } | 562 | } |
| 564 | else if (SYMBOLP (event)) | 563 | else if (SYMBOLP (event)) |
| 565 | { | 564 | { |
| @@ -593,7 +592,7 @@ selected frame is not an X-Windows frame. */) | |||
| 593 | XFIXNUM (XCAR (XCDR (decoded)))); | 592 | XFIXNUM (XCAR (XCDR (decoded)))); |
| 594 | else | 593 | else |
| 595 | modifiers = 0; | 594 | modifiers = 0; |
| 596 | #endif | 595 | #endif /* HAVE_PGTK */ |
| 597 | 596 | ||
| 598 | if (found) | 597 | if (found) |
| 599 | keycode = off + 0xff00; | 598 | keycode = off + 0xff00; |
| @@ -608,7 +607,7 @@ selected frame is not an X-Windows frame. */) | |||
| 608 | else | 607 | else |
| 609 | gdk_offscreen_window_set_embedder (osw, NULL); | 608 | gdk_offscreen_window_set_embedder (osw, NULL); |
| 610 | unblock_input (); | 609 | unblock_input (); |
| 611 | #endif | 610 | #endif /* HAVE_XINPUT2 */ |
| 612 | return Qnil; | 611 | return Qnil; |
| 613 | } | 612 | } |
| 614 | 613 | ||
| @@ -627,7 +626,7 @@ selected frame is not an X-Windows frame. */) | |||
| 627 | if (f) | 626 | if (f) |
| 628 | xg_event->key.state = xw_translate_x_modifiers (FRAME_DISPLAY_INFO (f), | 627 | xg_event->key.state = xw_translate_x_modifiers (FRAME_DISPLAY_INFO (f), |
| 629 | modifiers); | 628 | modifiers); |
| 630 | #endif | 629 | #endif /* !HAVE_X_WINDOWS */ |
| 631 | 630 | ||
| 632 | if (keycode > -1) | 631 | if (keycode > -1) |
| 633 | { | 632 | { |
| @@ -666,9 +665,9 @@ selected frame is not an X-Windows frame. */) | |||
| 666 | record_osr_embedder (xw->embedder_view); | 665 | record_osr_embedder (xw->embedder_view); |
| 667 | else | 666 | else |
| 668 | gdk_offscreen_window_set_embedder (osw, NULL); | 667 | gdk_offscreen_window_set_embedder (osw, NULL); |
| 669 | #endif | 668 | #endif /* HAVE_XINPUT2 */ |
| 670 | unblock_input (); | 669 | unblock_input (); |
| 671 | #endif | 670 | #endif /* USE_GTK */ |
| 672 | 671 | ||
| 673 | return Qnil; | 672 | return Qnil; |
| 674 | } | 673 | } |