diff options
| author | Po Lu | 2022-02-06 09:18:59 +0800 |
|---|---|---|
| committer | Po Lu | 2022-02-06 09:18:59 +0800 |
| commit | b38c0d6a2ff2dca89e9bf5feed49b7708ebf9942 (patch) | |
| tree | e9f1b7077a58a2f6d3d7874b96dccce87305af9b /src/pgtkterm.c | |
| parent | 9c1d6b1d6a24338517756437757cc4aaaa4da4e5 (diff) | |
| download | emacs-b38c0d6a2ff2dca89e9bf5feed49b7708ebf9942.tar.gz emacs-b38c0d6a2ff2dca89e9bf5feed49b7708ebf9942.zip | |
Clean up lots of #ifdef'd out code in PGTK files
Most of them are either relics from X or from the NS code
pgtkfns.c was copied from whole.
* src/pgtkfns.c (x_icon):
(pgtk_set_scroll_bar_foreground):
(pgtk_set_scroll_bar_background):
(Fx_create_frame):
(pgtk_window_is_ancestor):
(x_create_tip_frame):
* src/pgtkselect.c (syms_of_pgtkselect):
* src/pgtkterm.c (pgtk_iconify_frame):
(x_set_frame_alpha):
(button_event): Remove defined out code that cannot make sense.
* src/pgtkmenu.c (show_help_event): Remove ifdef'd out code and
reword comment.
Diffstat (limited to 'src/pgtkterm.c')
| -rw-r--r-- | src/pgtkterm.c | 50 |
1 files changed, 1 insertions, 49 deletions
diff --git a/src/pgtkterm.c b/src/pgtkterm.c index 23ad3c318c2..169d3f8a031 100644 --- a/src/pgtkterm.c +++ b/src/pgtkterm.c | |||
| @@ -582,10 +582,6 @@ pgtk_iconify_frame (struct frame *f) | |||
| 582 | 582 | ||
| 583 | block_input (); | 583 | block_input (); |
| 584 | 584 | ||
| 585 | #if 0 | ||
| 586 | x_set_bitmap_icon (f); | ||
| 587 | #endif | ||
| 588 | |||
| 589 | if (FRAME_GTK_OUTER_WIDGET (f)) | 585 | if (FRAME_GTK_OUTER_WIDGET (f)) |
| 590 | { | 586 | { |
| 591 | if (!FRAME_VISIBLE_P (f)) | 587 | if (!FRAME_VISIBLE_P (f)) |
| @@ -600,21 +596,9 @@ pgtk_iconify_frame (struct frame *f) | |||
| 600 | 596 | ||
| 601 | /* Make sure the X server knows where the window should be positioned, | 597 | /* Make sure the X server knows where the window should be positioned, |
| 602 | in case the user deiconifies with the window manager. */ | 598 | in case the user deiconifies with the window manager. */ |
| 603 | if (!FRAME_VISIBLE_P (f) && !FRAME_ICONIFIED_P (f) | 599 | if (!FRAME_VISIBLE_P (f) && !FRAME_ICONIFIED_P (f)) |
| 604 | #if 0 | ||
| 605 | && !FRAME_X_EMBEDDED_P (f) | ||
| 606 | #endif | ||
| 607 | ) | ||
| 608 | x_set_offset (f, f->left_pos, f->top_pos, 0); | 600 | x_set_offset (f, f->left_pos, f->top_pos, 0); |
| 609 | 601 | ||
| 610 | #if 0 | ||
| 611 | if (!FRAME_VISIBLE_P (f)) | ||
| 612 | { | ||
| 613 | /* If the frame was withdrawn, before, we must map it. */ | ||
| 614 | XMapRaised (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f)); | ||
| 615 | } | ||
| 616 | #endif | ||
| 617 | |||
| 618 | SET_FRAME_ICONIFIED (f, true); | 602 | SET_FRAME_ICONIFIED (f, true); |
| 619 | SET_FRAME_VISIBLE (f, 0); | 603 | SET_FRAME_VISIBLE (f, 0); |
| 620 | 604 | ||
| @@ -4600,22 +4584,6 @@ x_set_frame_alpha (struct frame *f) | |||
| 4600 | else if (alpha < alpha_min && alpha_min <= 1.0) | 4584 | else if (alpha < alpha_min && alpha_min <= 1.0) |
| 4601 | alpha = alpha_min; | 4585 | alpha = alpha_min; |
| 4602 | 4586 | ||
| 4603 | #if 0 | ||
| 4604 | /* If there is a parent from the window manager, put the property there | ||
| 4605 | also, to work around broken window managers that fail to do that. | ||
| 4606 | Do this unconditionally as this function is called on reparent when | ||
| 4607 | alpha has not changed on the frame. */ | ||
| 4608 | |||
| 4609 | if (!FRAME_PARENT_FRAME (f)) | ||
| 4610 | { | ||
| 4611 | Window parent = x_find_topmost_parent (f); | ||
| 4612 | if (parent != None) | ||
| 4613 | XChangeProperty (dpy, parent, dpyinfo->Xatom_net_wm_window_opacity, | ||
| 4614 | XA_CARDINAL, 32, PropModeReplace, | ||
| 4615 | (unsigned char *) &opac, 1); | ||
| 4616 | } | ||
| 4617 | #endif | ||
| 4618 | |||
| 4619 | set_opacity_recursively (FRAME_WIDGET (f), &alpha); | 4587 | set_opacity_recursively (FRAME_WIDGET (f), &alpha); |
| 4620 | /* without this, blending mode is strange on wayland. */ | 4588 | /* without this, blending mode is strange on wayland. */ |
| 4621 | gtk_widget_queue_resize_no_redraw (FRAME_WIDGET (f)); | 4589 | gtk_widget_queue_resize_no_redraw (FRAME_WIDGET (f)); |
| @@ -6152,9 +6120,6 @@ button_event (GtkWidget * widget, GdkEvent * event, gpointer * user_data) | |||
| 6152 | dpyinfo = FRAME_DISPLAY_INFO (frame); | 6120 | dpyinfo = FRAME_DISPLAY_INFO (frame); |
| 6153 | 6121 | ||
| 6154 | dpyinfo->last_mouse_glyph_frame = NULL; | 6122 | dpyinfo->last_mouse_glyph_frame = NULL; |
| 6155 | #if 0 | ||
| 6156 | x_display_set_last_user_time (dpyinfo, event->button.time); | ||
| 6157 | #endif | ||
| 6158 | 6123 | ||
| 6159 | if (gui_mouse_grabbed (dpyinfo)) | 6124 | if (gui_mouse_grabbed (dpyinfo)) |
| 6160 | f = dpyinfo->last_mouse_frame; | 6125 | f = dpyinfo->last_mouse_frame; |
| @@ -6183,14 +6148,6 @@ button_event (GtkWidget * widget, GdkEvent * event, gpointer * user_data) | |||
| 6183 | } | 6148 | } |
| 6184 | } | 6149 | } |
| 6185 | 6150 | ||
| 6186 | /* xg_event_is_for_scrollbar() doesn't work correctly on sway, and | ||
| 6187 | * we shouldn't need it. | ||
| 6188 | */ | ||
| 6189 | #if 0 | ||
| 6190 | if (f && xg_event_is_for_scrollbar (f, event)) | ||
| 6191 | f = 0; | ||
| 6192 | #endif | ||
| 6193 | |||
| 6194 | if (f) | 6151 | if (f) |
| 6195 | { | 6152 | { |
| 6196 | /* Is this in the tab-bar? */ | 6153 | /* Is this in the tab-bar? */ |
| @@ -6232,11 +6189,6 @@ button_event (GtkWidget * widget, GdkEvent * event, gpointer * user_data) | |||
| 6232 | if (!NILP (tab_bar_arg)) | 6189 | if (!NILP (tab_bar_arg)) |
| 6233 | inev.ie.arg = tab_bar_arg; | 6190 | inev.ie.arg = tab_bar_arg; |
| 6234 | } | 6191 | } |
| 6235 | #if 0 | ||
| 6236 | if (FRAME_X_EMBEDDED_P (f)) | ||
| 6237 | xembed_send_message (f, event->button.time, | ||
| 6238 | XEMBED_REQUEST_FOCUS, 0, 0, 0); | ||
| 6239 | #endif | ||
| 6240 | } | 6192 | } |
| 6241 | 6193 | ||
| 6242 | if (event->type == GDK_BUTTON_PRESS) | 6194 | if (event->type == GDK_BUTTON_PRESS) |